ad

app/admin/controller/Purchin.php

@@ -163,7 +163,7 @@ class Purchin extends Base
             $value['cgder'] = $all_supplier_list[$value['supplierNo']]['person']??'';
 
             //获取规格、品牌信息
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type'] == 4 ) {
                 $temp = Db::name('good_zixun')
                     ->alias('gz')
                     ->field('gz.specinfo,b.brand_name')

app/admin/controller/Sale.php

@@ -4701,7 +4701,7 @@ class Sale extends Base
 		$userCommon = new \app\admin\common\User();
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
                 $good = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,supplierNo')
@@ -4901,7 +4901,8 @@ class Sale extends Base
                         return app_show(1003, $value['outCode'] . '发货单只能由库管操作');
                     }
                 } else {
-                	if($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==3){
+                	if($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==3
+                	||$sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==4 ){
 		                $personid = Db::name('good_zixun')->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
 		                              ->where(['a.spuCode' => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['good_code'], 'a.is_del' => 0])
 		                              ->value('personid');

app/admin/controller/SupplierClient.php

@@ -167,7 +167,7 @@ class SupplierClient extends Base {
             $value['supplier_cgderid'] = $person_list[$value['supplierNo']]['personid'] ?? '';
             $value['supplier_cgder'] = $person_list[$value['supplierNo']]['person'] ?? '';
             $value['companyName'] = $names['data'][$value['companyNo']] ?? '';
-            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();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
                 //为了格式统一，缺了一个spec_value
@@ -342,7 +342,7 @@ class SupplierClient extends Base {
             $value['cgder'] = $all_supplier_list[$value['supplierNo']]['person']??'';
 
             //获取规格、品牌信息
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 ||$value['order_type']==4) {
                 $temp = Db::name('good_zixun')
                     ->alias('gz')
                     ->field('gz.specinfo,b.brand_name')
@@ -471,7 +471,7 @@ class SupplierClient extends Base {
         $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
 
         foreach ($list as $value){
-            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();
             }else {
                 $goon =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();