细节优化

app/admin/controller/OrderInv.php

@@ -496,6 +496,16 @@ class OrderInv extends BaseController{
                           }
                            $report=ReportCode::where(["qrdNo"=>$value['orderCode']])->find();
                            if($report)$report->rmField("invNo",$invinfo['invNo']);
+
+                          //将数量加回去
+                          Db::name('invoice_good')
+                              ->where([
+                                  'is_del' => 0,
+                                  'invNo' => $invNo,
+                                  'orderCode' => $value['orderCode']
+                              ])
+                              ->dec('goodNum', $qrdinfo['goodNum'])
+                              ->update();
                       }
                  }
             }
@@ -1141,9 +1151,12 @@ class OrderInv extends BaseController{
            	->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['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']])
+                 ->where('a.invNo', '<>', $invNo)
+                 ->sum("b.goodNum");
 			$item['winv_num'] = $item['goodNum'] - $item['ainv_num'];
 			$item['inv_num'] = $orderList[$item['sequenceNo']]['goodNum'];
         }

app/admin/controller/Sale.php

@@ -152,9 +152,11 @@ class Sale extends BaseController{
             $value['inv_tag_img']=$tag[4]['tag_img']??'';
             $value['inv_tag_remark']=$tag[4]['tag_remark']??'';
             $value['pay_tag_remark']=$tag[3]['tag_remark']??'';
-            $invArr = 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']])->group("a.status")
-					->column("sum(b.goodNum) as goodNum","a.status");
+            $invArr = 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']])->group("a.status")
+                ->column("sum(b.goodNum) as goodNum", "a.status");
             $value['inv_num'] = $invArr[1]??0;
             $value['ainv_num'] = $invArr[2]??0;
             $value['winv_num'] =$value['goodNum']- $value['inv_num']-$value['ainv_num'];

app/command/Report.php

@@ -184,8 +184,8 @@ class Report extends Command
 		          d.totalPrice 总价,
 		          a.inv_type 开票种类,
 		          a.open_type 开票方式,
-		          a.remark 申请备注,
-		          c.remark 发票备注')
+		          c.remark 申请备注,
+		          a.remark 发票备注')
 		          ->leftJoin('invoice_pool_info b', 'a.invNo=b.invNo')
 		          ->leftJoin('invoice_ticket c', 'a.invNo=c.invNo AND c.type=0 AND c.status=1')
 		          ->leftJoin('invoice_good d', 'd.invNo=a.invNo')