ad

app/admin/controller/Orderback.php

@@ -526,9 +526,11 @@ class Orderback extends \app\BaseController
                             Db::rollback();
                             return error_show(1005,'备库单未完全入库');
                         }
-                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgd['bkcode'],"order_type"=>5,"is_del"=>0])->sum("send_num-th_num");
-                        $orderbk['balance_num'] = $orderbk['total_num']-$merge_num;
-                        $orderbk['merge_num']=$merge_num;
+                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$bk['bkcode'],"order_type"=>5,"is_del"=>0])
+                            ->field("sum(send_num)-sum(th_num) as num")->find();
+
+                        $orderbk['balance_num']=$orderbk['total_num']-$merge_num['num'];
+                        $orderbk['merge_num']=$merge_num['num'];
                         $orderbk['updatetime']=date("Y-m-d H:i:s");
                         $orderbkup=Db::name("order_bk")->save($orderbk);
                         if($orderbkup==false){

app/admin/controller/Sale.php

@@ -3206,10 +3206,10 @@ class Sale extends Base
             if($insetrCgd==false){
                 return false;
             }
-        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgdinfo['bkcode'],"order_type"=>5,"is_del"=>0])->sum("send_num-th_num");
-
-        $cgd['balance_num']=$outinfo['total_num']-$merge_num;
-        $cgd['merge_num']=$merge_num;
+        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgdinfo['bkcode'],"order_type"=>5,"is_del"=>0])
+            ->field("sum(send_num)-sum(th_num) as num")->find();
+        $cgd['balance_num']=$cgd['total_num']-$merge_num['num'];
+        $cgd['merge_num']=$merge_num['num'];
         $cgd['updatetime']=date("Y-m-d H:i:s");
         $up=Db::name("order_bk")->save($cgd);
         if($up==false){