ad

app/admin/controller/Reorder.php

@@ -938,7 +938,6 @@ class Reorder extends Base
                             return error_show(1005, '可售商品入库失败');
                         }
                         $stockid = isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID();
-                        if ($orderinfo['is_stock'] == 1){
                         	$sabebn =Db::name("sale_info")->where(["orderCode"=>$orderinfo["orderCode"]])->select()->toArray();
                             if(!empty($sabebn)){
                         	$total_num =$info['num'];
@@ -971,10 +970,16 @@ class Reorder extends Base
                                     return error_show(1005, '可售商品Bn库存数入库失败');
                         		}
                         	}
+                        }else{
+								if($orderinfo['order_type']!=1){
+									$bn=makeNo("BN");
+									$bnin=GoodStockInfo::AddBn($stockid,$bn,$info['num'],$cgd['good_price']??0);
+	                                if($bnin==false){
+	                                     Db::rollback();
+	                                    return error_show(1005, '可售商品Bn库存数入库失败');
+	                                }
+								}
                         }
-                        }
-
-
                         $good_data = ['good_log_code' => $info['returnCode'], "stock_id" => $stockid, "type" => 1, 'stock'=> $info['num'], "stock_name" => "usable_stock"];
                         GoodLog::LogAdd($this->post['token'], $good_data, 'XSTHD');
                     }