|
|
@@ -355,7 +355,7 @@ class Purchin extends BaseController
|
|
|
$info['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$update = Db::name("purchease_in")->save($info);
|
|
|
if($update){
|
|
|
- ActionLog::logAdd($this->post['token'],$order,"rkd",$status,$this->post);
|
|
|
+ ActionLog::logAdd($this->post['token'],$order,"入库单",$status,$this->post);
|
|
|
$process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'RKD'];
|
|
|
ProcessOrder::AddProcess($this->post['token'],$process);
|
|
|
if($status==0){
|
|
|
@@ -434,10 +434,11 @@ class Purchin extends BaseController
|
|
|
$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);
|
|
|
- $good_data[]=["stock_id"=> $good['id'],"type"=>1,'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
|
|
|
+ $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,
|
|
|
+ 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
|
|
|
if($upd){
|
|
|
- GoodLog::LogAdd($this->post['token'],$good_data,'rkd');
|
|
|
- ActionLog::logAdd($this->post['token'],$order,"gst", 1,$good );
|
|
|
+ GoodLog::LogAdd($this->post['token'],$good_data,'入库单');
|
|
|
+ ActionLog::logAdd($this->post['token'],$order,"仓库库存", 1,$good );
|
|
|
Db::commit();
|
|
|
return app_show(0,'商品入库成功');
|
|
|
}else{
|
