ad

app/admin/controller/Reorder.php

@@ -258,7 +258,7 @@ class Reorder extends Base
                         return error_show(1005, '采购单数据更新失败');
                     }
                     if ($cgd['bkcode'] != "") {
-                        $bk = Db::name("purchease_order")->where(["bkcode" => $cgd['bkcode'], "order_type" => 1, "is_del" => 0])
+                        $bk = Db::name("purchease_order")->where(["bkcode" => $cgd['bkcode'], "order_type" => 1, "order_source" =>0, "is_del" => 0])
                             ->find();
                         if ($bk == false) {
                             Db::rollback();
@@ -269,7 +269,9 @@ class Reorder extends Base
                             Db::rollback();
                             return error_show(1005, '备库单未完全入库');
                         }
-                        $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 1, "is_del" => 0])->field("sum(send_num)-sum(th_num) as num")->find();
+                        $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" =>
+                                1, "is_del" => 0])->where("order_source","<>",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'];
@@ -768,7 +770,7 @@ class Reorder extends Base
                             return error_show(1005, '采购单数据更新失败');
                         }
                         if ($cgd['bkcode'] != "") {
-                            $bk = Db::name("purchease_order")->where(["bkcode" => $cgd['bkcode'], "order_type" => 1, "is_del" => 0])
+                            $bk = Db::name("purchease_order")->where(["bkcode" => $cgd['bkcode'], "order_type" => 1,"order_source"=>0, "is_del" => 0])
                                 ->find();
                             if ($bk == false) {
                                 Db::rollback();
@@ -779,7 +781,8 @@ class Reorder extends Base
                                 Db::rollback();
                                 return error_show(1005, '备库单未完全入库');
                             }
-                            $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 1, "is_del" => 0])
+                            $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type"
+                                => 1, "is_del" => 0])->where("order_source","<>",0)
                                 ->field("sum(send_num)-sum(th_num) as num")->find();
 
                             $orderbk['balance_num'] = $orderbk['total_num'] - $merge_num['num'];

app/admin/controller/Sale.php

@@ -3688,6 +3688,7 @@ class Sale extends Base
                 }
             }
         $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgdinfo['bkcode'],"order_type"=>1,"is_del"=>0])
+            ->where("order_source","<>",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'];