|
@@ -415,7 +415,7 @@ class Sale extends Base
|
|
|
if($supplier==false){
|
|
|
return false;
|
|
|
}
|
|
|
- $wsm= Db::name("warehouse_info")->where(["supplierNo"=>$data["supplierNo"],"companyNo"=>$data['companyNo'],"is_del"=>0])->find();
|
|
|
+ $wsm= Db::name("warehouse_info")->where(["supplierNo"=>$data["supplierNo"],"companyNo"=>$data['companyNo'],"wsm_type"=>2,"is_del"=>0])->find();
|
|
|
if($wsm==false){
|
|
|
$wsm_code = makeNo("WSM");
|
|
|
$inwsm=[
|
|
@@ -440,12 +440,6 @@ class Sale extends Base
|
|
|
return false;
|
|
|
}
|
|
|
}else{
|
|
|
- if($wsm['wsm_type']==2){
|
|
|
- $wsm['contactor']=$data['createrid'];
|
|
|
- $wsm['contactor_name']=$data['creater'];
|
|
|
- $wsm['updatetime']=date("Y-m-d H:i:s");
|
|
|
- Db::name("warehouse_info")->save($wsm);
|
|
|
- }
|
|
|
$wsm_code =$wsm['wsm_code'];
|
|
|
}
|
|
|
|