ad

app/admin/controller/Purchin.php

@@ -811,18 +811,18 @@ class Purchin extends Base
                     $order = ["order_code"=>$good['spuCode'],"status"=>1,"action_remark"=>'', "action_type"=>"edit"];
                 }
                 $good['wait_in_stock']-=$wsm_num;
-                if($good['presale_stock']>0){
-                    if($good['presale_stock']>=$wsm_num){
-                        $good['presale_stock']-=$wsm_num;
-                        $good['wait_out_stock']+=$wsm_num;
-                    }else{
-                        $good['presale_stock']=0;
-                        $good['usable_stock']+=$wsm_num-$good['presale_stock'];
-                        $good['wait_out_stock']+=$good['presale_stock'];
-                    }
-                }else{
+//                if($good['presale_stock']>0){
+//                    if($good['presale_stock']>=$wsm_num){
+//                        $good['presale_stock']-=$wsm_num;
+//                        $good['wait_out_stock']+=$wsm_num;
+//                    }else{
+//                        $good['presale_stock']=0;
+//                        $good['usable_stock']+=$wsm_num-$good['presale_stock'];
+//                        $good['wait_out_stock']+=$good['presale_stock'];
+//                    }
+//                }else{
                     $good['usable_stock']+=$wsm_num;
-                }
+  //              }
 //                $good['usable_stock']+=$wsm_num;
 
                 $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];

app/admin/controller/Sale.php

@@ -90,7 +90,7 @@ class Sale extends Base
         }
         if($goodinfo['is_stock']==1){
             $stock =Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")->where
-            (["spuCode"=>$spuCode, "a.is_del"=>0,"a.status"=>1,"b.wsm_type"=>5,"b.companyNo"=>$supplierNo])->field("a.id,a.wait_in_stock,a.presale_stock,a.usable_stock,a.wait_out_stock")->find();
+            (["spuCode"=>$spuCode, "a.is_del"=>0,"a.status"=>1,"b.wsm_type"=>5,"b.companyNo"=>$supplierNo])->field("a.id,a.wait_in_stock,a.usable_stock,a.wait_out_stock")->find();
             if($stock==false ||$stock['usable_stock']<$good_num){
                 return error_show(1003,"库存数量不足");
             }