|
|
@@ -879,7 +879,7 @@ class Purchin extends Base
|
|
|
$process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id];
|
|
|
ProcessOrder::AddProcess($this->post['token'],$process);
|
|
|
|
|
|
- $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
|
|
|
+ $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->findOrEmpty();
|
|
|
|
|
|
if(empty($good)) {
|
|
|
$good=[
|
|
|
@@ -1070,10 +1070,17 @@ class Purchin extends Base
|
|
|
$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($this->post['token'],$good_data,'RKD');
|
