ad

app/admin/controller/CombindStock.php

@@ -46,13 +46,18 @@ class CombindStock extends Base
 			"stock_num|库存数量"=>"require|number|gt:0",
 			"flag|库存变化标识"=>"require|number|in:0,1"]);
 		if($valid->check($param)==false)return error_show(1004,$valid->getError());
-		$goodbasic =Db::name("good")->where("spuCode",$param["spuCode"])->find();
+		$goodbasic =Db::name("good_basic")->where("spuCode",$param["spuCode"])->find();
 		if($goodbasic==false) return error_show(1004,"未找到组合商品信息");
 		if($goodbasic['is_combind']==0) return error_show(1004,'商品不是组合商品');
 		if($param['flag']==0){//减库存 先判断库存是否足够
-			if($goodbasic['usable_stock']<$param['stock_num'])return error_show(1004,"商品库存数不足");
-			$stock = Db::name("good_stock")->where(["spuCode"=>$param['spuCode'],"wsm_code"=>$param["wsm_code"]])->value("usable_stock",0);
-			if($stock< $param['stock_num'])return error_show(1004,'商品库存数不足');
+			$stock = (new GoodStock())->where(["spuCode"=>$param['spuCode'],"wsm_code"=>$param["wsm_code"]])
+			->findOrEmpty();
+			if($stock->isEmpty())return error_show(1004,'商品库存信息为找到');
+			if($stock->usable_stock< $param['stock_num'])return error_show(1004,'商品库存数不足');
+			$isT = (new \app\admin\model\Good())->where(['spuCode'=>$param['spuCode']])->findOrEmpty();
+			if($isT->isEmpty()==false){
+				if($isT->usable_stock<  $param['stock_num'])return error_show(1004,'商品库存数不足');
+			}
 		}
 		
 		$combindList = $this->combind->where(["spuCode"=>$param["spuCode"],"is_del"=>0])->select()->toArray();
@@ -76,8 +81,14 @@ class CombindStock extends Base
 			$up =$this->combindStock->save($data);
 			if($up==false) throw new \Exception("创建失败");
 			if($param["flag"]==0){
-				$stockup = Db::name('good')->where('spuCode',$param['spuCode'])->dec('usable_stock',$param["stock_num"])->update();
-				if($stockup==false) throw new \Exception('组合商品库存占用失败');
+				if($isT->isEmpty()==false){
+					$stockup = Db::name('good')->where('spuCode',$param['spuCode'])->dec('usable_stock',$param["stock_num"])->update();
+					if($stockup==false) throw new \Exception('组合商品库存占用失败');
+				}
+				$stock->usable_stock = bcsub($stock->usable_stock,$param['stock_num']);
+				$stock->total_stock = bcsub($stock->total_stock ,$param['stock_num']);
+				$reld=$stock->save();
+				if($reld==false) throw new \Exception('组合商品库存占用失败');
 			}else{
 				foreach ($combindList as $item){
 					$num = bcmul($item['child_num'],$param['stock_num'],2);
@@ -122,6 +133,9 @@ class CombindStock extends Base
 		if($goodinfo->isEmpty())return error_show(1004,'未找到对应得组合商品信息');
 		$comblist = (new GoodCombind())->where(["spuCode"=>$row->spuCode,"is_del"=>0])->select()->toArray();
 		if(empty($comblist)) return error_show(1004,'组合商品子商品信息未找到');
+		$good= (new \app\admin\model\Good())->where(['spuCode'=>$row->spuCode])->findOrEmpty();
+		$GoodStock =new GoodStock();
+		$stock =$GoodStock->where(['spuCode'=>$row->spuCode,'wsm_code'=>$row->wsm_code])->findOrEmpty();
 		$row->status = $param['status'];
 		$row->remark = $param['remark'];
 		$row->startTrans();
@@ -129,8 +143,6 @@ class CombindStock extends Base
 			$up =$row->save();
 			if($up==false) throw new \Exception("数据状态更新失败");
 			if($param['status']==2){
-				$GoodStock =new GoodStock();
-				$stock =$GoodStock->where(["spuCode"=>$row->spuCode,"wsm_code"=>$row->wsm_code])->findOrEmpty();
 				if($row->flag==1){
 					$bn = makeNo('BN');
 					if($stock->isEmpty()){
@@ -151,7 +163,6 @@ class CombindStock extends Base
 						if($up==false) throw new \Exception("仓库库存数更新失败");
 						$id = $stock->id;
 					}
-					$good= (new \app\admin\model\Good())->where(["spuCode"=>$row->spuCode])->findOrEmpty();
 					if($good->isEmpty()==false){
 						$good->usable_stock=bcadd($good->usable_stock,$row->stock_num);
 						$upe=$good->save();
@@ -173,7 +184,7 @@ class CombindStock extends Base
 					(new CombindBninfo())->AaddBNLog($row->spuCode,$bn,$bnlist);
 				}else{
 					if($stock->usable_stock < $row->stock_num)  throw new \Exception('仓库可用库数不足');
-					$up =GoodStockInfo::SaleBn($stock->id,intval($row->stock_num));
+					$up =GoodStockInfo::StockBnSub($stock->id,intval($row->stock_num));
 			        if(empty($up)) throw new \Exception('未找到对应子商品BN库存信息');
 					foreach ($up as $item){
 						$bnlist =$this->combind->subStock($row->spuCode,$item['bnCode'],$item['num']);
@@ -182,12 +193,16 @@ class CombindStock extends Base
 				}
 			}
 			if($param['status']==3){
-				$good= (new \app\admin\model\Good())->where(['spuCode'=>$row->spuCode])->findOrEmpty();
-					if($good->isEmpty()==false){
 						if($row->flag==0){
-							$good->usable_stock = bcadd($good->usable_stock ,$row->stock_num);
-							$stockup = $good->save();
-							if($stockup==false) throw new \Exception('组合商品库存解除驳回失败');
+							if($good->isEmpty()==false){
+								$good->usable_stock = bcadd($good->usable_stock ,$row->stock_num);
+								$stockup = $good->save();
+								if($stockup==false) throw new \Exception('组合商品库存解除驳回失败');
+							}
+							$stock->usable_stock = bcadd($stock->usable_stock,$param['stock_num']);
+							$stock->total_stock = bcadd($stock->total_stock ,$param['stock_num']);
+							$reld=$stock->save();
+							if($reld==false) throw new \Exception('组合商品库存解除驳回失败');
 						}else{
 						$childarr= Db::name('good')->whereIn('spuCode',array_unique(array_column($comblist,'childCode')))->column('spuCode,usable_stock,is_combind','spuCode');
 	
@@ -202,7 +217,7 @@ class CombindStock extends Base
 							}
 						}
 					}
-			}
+			
 			$row->commit();
 		}catch (\Exception $exception){
 		 $row->rollback();

app/admin/model/GoodStockInfo.php

@@ -303,7 +303,7 @@ class GoodStockInfo extends Model
 	}
 	
 	
-	public function StockBnSub($stockid,$num){
+	public static function StockBnSub($stockid,$num){
 		$arr = self::where([['balance_num','>',0]])->where(['stockid'=>$stockid])->select()->toArray();
 		if(empty($arr)) throw new Exception('库存批次数量不足',1006);
 		$list=[];