ad

app/admin/controller/Goodup.php

@@ -1629,7 +1629,9 @@ class Goodup extends Base
                     $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                     if($iso==false){
                         unset($value['id']);
-                        $stock_num = Db::name('good_stock')->where(['is_del' => 0, 'spuCode' => $value['spuCode']])->sum('usable_stock');
+                        $stock_num = Db::name('good_stock')->alias("a")
+                        ->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")
+                        ->where(['a.is_del' => 0, 'a.spuCode' =>$value['spuCode'],"b.wsm_type"=>[2,5]])->sum('usable_stock');
                         $value['usable_stock'] =$stock_num;
                         $value['addtime']=date("Y-m-d H:i:s");
                         $value['updatetime']=date("Y-m-d H:i:s");

app/admin/controller/Sale.php

@@ -654,7 +654,9 @@ class Sale extends Base
             $i = 1;
 //        	$goodStock_num =$goodStock['usable_stock']??0;
             $total_num = array_sum(array_column($addrlist, "receipt_quantity"));
-            $goodStock_num = Db::name('good_stock')->where(['is_del' => 0, 'spuCode' => $etid['good_code']])->sum('usable_stock');
+            $goodStock_num = Db::name('good_stock')->alias("a")
+                        ->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")
+                        ->where(['a.is_del' => 0, 'a.spuCode' =>$etid['spuCode'],"b.wsm_type"=>[2,5]])->sum('usable_stock');
 
             if ($goodStock_num < $total_num && $etid['is_stock'] == 1) throw new Exception("库存品库存数不足发货");
             foreach ($addrlist as $value) {