|
|
@@ -476,6 +476,7 @@ class Allot extends BaseController
|
|
|
$temp['usable_num'] = $value['usable_num'];
|
|
|
$temp['error_num'] = $value['error_num'];
|
|
|
$temp['error_remark'] = $value['error_remark'];
|
|
|
+ $temp['stock_num']=$value['stock_num'];
|
|
|
$temp['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->save($temp);
|
|
|
if($np==false){
|
|
|
@@ -564,7 +565,6 @@ public function vesio(){
|
|
|
$temp = [];
|
|
|
$temp['error_code']="";
|
|
|
$temp['good_num']=$st['usable_stock'];
|
|
|
- $temp['usable_num'] = $st['usable_stock'];
|
|
|
$temp['error_num'] = $value['error_num'];
|
|
|
$temp['stock_num'] = $value['stock_num'];
|
|
|
$temp['error_remark'] = $value['error_remark'];
|
|
|
@@ -580,12 +580,12 @@ public function vesio(){
|
|
|
return error_show(1002,"未找到数据");
|
|
|
}
|
|
|
$stock = Db::name("good_stock")->where(["good_type_code"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
|
|
|
- if($stock['wait_in_stock']<$p['allot_num']){
|
|
|
+ if($stock['wait_in_stock']<$p['stock_num']){
|
|
|
Db::rollback();
|
|
|
return error_show(2000,"超出待入库存数量");
|
|
|
}
|
|
|
- $stock['wait_in_stock']-=$p['allot_num'];
|
|
|
- $stock['usable_stock']+=$p['allot_num'];
|
|
|
+ $stock['wait_in_stock']-=$p['stock_num'];
|
|
|
+ $stock['usable_stock']+=$p['stock_num'];
|
|
|
$stock['updatetime']=date('Y-m-d H:i:s');
|
|
|
$stock['total_stock']=$stock['wait_out_stock']+$stock['usable_stock'];
|
|
|
$dr = Db::name('good_stock')->update($stock);
|
panlumeng