|
|
@@ -1119,27 +1119,21 @@ 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{
|
|
|
- $good['usable_stock']+=$wsm_num;
|
|
|
- // }
|
|
|
-// $good['usable_stock']+=$wsm_num;
|
|
|
-
|
|
|
+ $good['usable_stock']+=$wsm_num;
|
|
|
$good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];
|
|
|
$good['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$upd= Db::name("good_stock")->save($good);
|
|
|
- if($upd==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1002,"库存更新失败");
|
|
|
- }
|
|
|
+ $stockid=$good['id']?? Db::name("good_stock")->getLastInsID();
|
|
|
+ if($upd){
|
|
|
+ $bnin=GoodStockInfo::AddBn($stockid,$info['bnCode'],$info['wsm_num'],$cgdinfo['good_price']);
|
|
|
+ if($bnin==false){
|
|
|
+ Db::rollback();
|
|
|
+ return error_show(1004,"库存bn数据新增失败");
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ Db::rollback();
|
|
|
+ return error_show(1002,"商品入库失败");
|
|
|
+ }
|
|
|
$good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
|
|
|
$good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2, 'stock'=>$info['wsm_num'],"stock_name"=>"wait_in_stock"];
|
|
|
GoodLog::LogAdd(['id' => $this->uid, 'nickname' => $this->uname],$good_data,'RKD');
|
