|
|
@@ -700,7 +700,7 @@ public function vesio(){
|
|
|
ActionLog::logAdd($this->post['token'],$order,"DBD",5,$this->post);
|
|
|
foreach ($dain as $value) {
|
|
|
$st = Db::name("good")->alias("b")
|
|
|
- ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_in'], 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
|
|
|
+ ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_in'], 'b.spuCode' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
|
|
|
->field("b.spuCode,b.good_name,c.wsm_code,c.usable_stock")->find();
|
|
|
if (empty($st)) {
|
|
|
Db::rollback();
|
|
|
@@ -713,17 +713,17 @@ public function vesio(){
|
|
|
$temp['stock_num'] = $value['stock_num'];
|
|
|
$temp['error_remark'] = $value['error_remark'];
|
|
|
$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']])->save($temp);
|
|
|
+ $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,"数据更新失败");
|
|
|
}
|
|
|
- $p = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
|
|
|
+ $p = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
|
|
|
if($p==false){
|
|
|
Db::rollback();
|
|
|
return error_show(1002,"未找到数据");
|
|
|
}
|
|
|
- $stock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
|
|
|
+ $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
|
|
|
if($stock['wait_in_stock']<$p['stock_num']){
|
|
|
Db::rollback();
|
|
|
return error_show(2000,"超出待入库存数量");
|
