|
|
@@ -467,6 +467,11 @@ class Allot extends BaseController
|
|
|
Db::rollback();
|
|
|
return error_show(1003, "未找到商品");
|
|
|
}
|
|
|
+ $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->find();
|
|
|
+ if(empty($n)){
|
|
|
+ Db::rollback();
|
|
|
+ return error_show(10032, "未找到数据");
|
|
|
+ }
|
|
|
// if($value['allot_num']>$st['usable_stock']){
|
|
|
// return error_show(2000,"库存数量不足");
|
|
|
// }
|
|
|
@@ -476,14 +481,14 @@ 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['stock_num']=$n['allot_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){
|
|
|
Db::rollback();
|
|
|
return error_show(1001,"数据更新失败");
|
|
|
}
|
|
|
- $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->find();
|
|
|
+
|
|
|
$stock = Db::name("good_stock")->where(["good_type_code"=>$value['good_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
|
|
|
if($stock['intra_stock']<$n['allot_num']){
|
|
|
Db::rollback();
|
panlumeng