ad

app/admin/model/GoodStock.php

@@ -37,7 +37,7 @@ class GoodStock extends Model
 					$temp = $item->usable_stock;
 					$num =bcsub($num,$item->usable_stock);
 				}
-				$bn=GoodStockInfo::SaleBn($item->id,intval($temp));
+				$bn=GoodStockInfo::StockBnSub($item->id,intval($temp),1);
 				$returen=array_merge($returen,$bn);
 			}
 			

app/admin/model/GoodStockInfo.php

@@ -303,7 +303,7 @@ class GoodStockInfo extends Model
 	}
 	
 	
-	public static function StockBnSub($stockid,$num){
+	public static function StockBnSub($stockid,$num,$add=0){
 		$arr = self::where([['balance_num','>',0]])->where(['stockid'=>$stockid])->select()->toArray();
 		if(empty($arr)) throw new Exception('库存批次数量不足',1006);
 		$list=[];
@@ -317,19 +317,22 @@ class GoodStockInfo extends Model
 		    	$num-=$item['balance_num'];
 		    	$update['updatetime'] =date('Y-m-d H:i:s');
 		    	$temp=['stockid'=>$item['stockid'],'bnCode'=>$item['bnCode'],'spuCode'=>$stock['spuCode'],'num'=>$item['balance_num'],'origin_price'=>$item['origin_price']];
-//		    	$stockup=['usable_stock'=>$stock['usable_stock']-$item['balance_num'],'wait_out_stock'=>$stock['wait_out_stock']+$item['balance_num'],'updatetime'=>date('Y-m-d H:i:s')];
+		    	$stockup=['usable_stock'=>$stock['usable_stock']-$item['balance_num'],'updatetime'=>date('Y-m-d H:i:s')];
 		    }else{
 				$update['balance_num']=$item['balance_num']-$num;
 		    	$update['used_num']=$item['used_num']+$num;
 		    	$update['updatetime'] =date('Y-m-d H:i:s');
 		    	$temp=['stockid'=>$item['stockid'],'bnCode'=>$item['bnCode'],'spuCode'=>$stock['spuCode'],'num'=>$num,'origin_price'=>$item['origin_price']];
-//		    	$stockup=['usable_stock'=>$stock['usable_stock']-$num,'wait_out_stock'=>$stock['wait_out_stock']+$num,'updatetime'=>date('Y-m-d H:i:s')];
+		    	$stockup=['usable_stock'=>$stock['usable_stock']-$num,'updatetime'=>date('Y-m-d H:i:s')];
 				$num=0;
 		    }
 			$up=self::update($update,$item);
 		    if($up==false)  throw new Exception('库存批次库存更新失败',1006);
-//		    $stup=self::name('good_stock')->where($stock)->update($stockup);
-//		    if($stup==false)  throw new Exception('库存更新失败',1006);
+		    if($add==1){
+			     $stup=self::name('good_stock')->where($stock)->update($stockup);
+			    if($stup==false)  throw new Exception('库存更新失败',1006);
+		    }
+
 		    $list[]=$temp;
 		}
 		return $list;