|
|
@@ -957,7 +957,7 @@ class Purchin extends Base
|
|
|
$order = ["order_code"=>$good['spuCode'],"status"=>1,"action_remark"=>'', "action_type"=>"edit"];
|
|
|
}
|
|
|
$good['usable_stock']+=$info['wsm_num'];
|
|
|
- $good['wait_in_stock']-=$info['wsm_num']+$return['return_num']-$return['reissue_num'];
|
|
|
+ $good['wait_in_stock']-=$info['wsm_num']-$return['return_num']+$return['reissue_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);
|
|
|
@@ -970,8 +970,8 @@ class Purchin extends Base
|
|
|
GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
|
|
|
|
|
|
$order = ["order_code"=>$cgdinfo['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
|
|
|
- $cgdinfo['wsend_num']-=$return['return_num']-$return['reissue_num'];
|
|
|
- $cgdinfo['good_num']-=$return['return_num']-$return['reissue_num'];
|
|
|
+ $cgdinfo['wsend_num']-=$return['return_num']+$return['reissue_num'];
|
|
|
+ $cgdinfo['good_num']-=$return['return_num']+$return['reissue_num'];
|
|
|
$cgdinfo['total_fee']=round($cgdinfo['good_num']*$cgdinfo['good_price'],2);
|
|
|
$cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
|
|
|
$cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
|
