|
|
@@ -597,7 +597,7 @@ class Allot extends BaseController
|
|
|
Db::rollback();
|
|
|
return error_show(1003, "未找到商品");
|
|
|
}
|
|
|
- $n = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=> $al['allot_code'],'is_del'=>0])->find();
|
|
|
+ $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code'],'is_del'=>0])->find();
|
|
|
if(empty($n)){
|
|
|
Db::rollback();
|
|
|
return error_show(10032, "未找到数据");
|
|
|
@@ -613,14 +613,13 @@ class Allot extends BaseController
|
|
|
$temp['error_remark'] = $value['error_remark'];
|
|
|
$temp['stock_num']=$n['allot_num'];
|
|
|
$temp['updatetime'] = date("Y-m-d H:i:s");
|
|
|
- $np = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=> $al['allot_code'],'is_del'=>0])->save($temp);
|
|
|
+ $np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code'],'is_del'=>0])->save($temp);
|
|
|
if($np==false){
|
|
|
Db::rollback();
|
|
|
return error_show(1001,"数据更新失败");
|
|
|
}
|
|
|
|
|
|
- $stock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_out'],
|
|
|
- "is_del"=>0])->find();
|
|
|
+ $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
|
|
|
if($stock['intra_stock']<$n['allot_num']){
|
|
|
Db::rollback();
|
|
|
return error_show(2000,"超出库存数量");
|
|
|
@@ -634,10 +633,10 @@ class Allot extends BaseController
|
|
|
}
|
|
|
//商品变动日志表，good_log_code字段存储调拨单号
|
|
|
$good_data[]=['good_log_code'=>$allot_code,"stock_id"=>$stock['id'],"type"=>2,'stock'=>$n['allot_num'],"stock_name"=>"intra_stock"];
|
|
|
- $instock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
|
|
|
+ $instock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
|
|
|
if($instock==false){
|
|
|
$instock =[];
|
|
|
- $instock['spuCode']=$value['spuCode'];
|
|
|
+ $instock['spuCode']=$value['good_code'];
|
|
|
$instock['wsm_code']=$al['wsm_in'];
|
|
|
$instock['wait_in_stock']=0;
|
|
|
$instock['wait_out_stock']=0;
|
