|
@@ -179,7 +179,7 @@ class Purch extends Base
|
|
// $supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
|
|
// $supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
|
|
// $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
|
|
// $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
|
|
// $value['supplier_cgder'] = $supplierCgder['person'] ??'';
|
|
// $value['supplier_cgder'] = $supplierCgder['person'] ??'';
|
|
- if($value['order_type']==3){
|
|
|
|
|
|
+ if($value['order_type']==3||$value['order_type']==4){
|
|
$goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
|
|
$goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
|
|
$value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
|
|
$value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
|
|
}else {
|
|
}else {
|
|
@@ -240,7 +240,7 @@ class Purch extends Base
|
|
$im = Db::name('purchease_back')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
|
|
$im = Db::name('purchease_back')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
|
|
$var=[];
|
|
$var=[];
|
|
foreach ($im as $value){
|
|
foreach ($im as $value){
|
|
- if($data['order_type']==3){
|
|
|
|
|
|
+ if($data['order_type']==3||$data['order_type']==4){
|
|
$goo = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
|
|
$goo = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
|
|
}else {
|
|
}else {
|
|
$goo =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
|
|
$goo =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
|
|
@@ -254,7 +254,7 @@ class Purch extends Base
|
|
}
|
|
}
|
|
//采购工差单
|
|
//采购工差单
|
|
$dom = Db::name("purchease_diff")->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->find();
|
|
$dom = Db::name("purchease_diff")->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->find();
|
|
- if($data['order_type']==3){
|
|
|
|
|
|
+ if($data['order_type']==3||$data['order_type']==4){
|
|
$goon = Db::name("good_zixun")->where(["spuCode"=>$data['spuCode'],"is_del"=>0])->find();
|
|
$goon = Db::name("good_zixun")->where(["spuCode"=>$data['spuCode'],"is_del"=>0])->find();
|
|
}else {
|
|
}else {
|
|
$goon =Db::name('good_basic')->where(['spuCode'=>$data['spuCode']])->find();
|
|
$goon =Db::name('good_basic')->where(['spuCode'=>$data['spuCode']])->find();
|
|
@@ -772,7 +772,7 @@ class Purch extends Base
|
|
if($cg==""){
|
|
if($cg==""){
|
|
return error_show(1002,"未找到采购单数据");
|
|
return error_show(1002,"未找到采购单数据");
|
|
}
|
|
}
|
|
- if($cg['order_type']==3){
|
|
|
|
|
|
+ if($cg['order_type']==3||$cg['order_type']==4){
|
|
$gd = Db::name("good_zixun")->where(["spuCode"=>$cg['spuCode']])->find();
|
|
$gd = Db::name("good_zixun")->where(["spuCode"=>$cg['spuCode']])->find();
|
|
}else {
|
|
}else {
|
|
$gd =Db::name('good_basic')->where(['spuCode'=>$cg['spuCode']])->find();
|
|
$gd =Db::name('good_basic')->where(['spuCode'=>$cg['spuCode']])->find();
|