细节优化

app/admin/controller/Purch.php

@@ -885,7 +885,7 @@ class Purch extends Base
         if($cg==""){
             return error_show(1002,"未找到采购单数据");
         }
-        if($cg['order_type']==3){
+        if (in_array($cg['order_type'], [3, 4])) {
             $gd = Db::name("good_zixun")->where(["spuCode"=>$cg['spuCode']])->find();
         }else {
             $gd =Db::name('good_basic')->where(['spuCode'=>$cg['spuCode']])->find();
@@ -1100,7 +1100,7 @@ class Purch extends Base
         }
         $dn = Db::name('purchease_order')->where(['cgdNo'=>$idinf['cgdNo'],'is_del'=>0])->find();
 
-        if($dn['order_type']==3){
+        if (in_array($dn['order_type'], [3, 4])) {
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dn['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dn['spuCode']])->find();
@@ -1281,7 +1281,7 @@ class Purch extends Base
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if (in_array($value['order_type'], [3, 4])) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,tax')

app/admin/controller/Purchin.php

@@ -1487,7 +1487,7 @@ class Purchin extends Base
         $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
 
         foreach ($list as $value){
-            if($value['order_type']==3){
+            if (in_array($value['order_type'], [3, 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();

app/admin/controller/Sale.php

@@ -3272,7 +3272,7 @@ class Sale extends Base
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
 
         foreach ($list as $value) {
-            if ($value['order_type'] == 3) {
+            if (in_array($value['order_type'], [3, 4])) {
                 $goon = Db::name("good_zixun")->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
             } else {
                 $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -3479,7 +3479,7 @@ class Sale extends Base
         if ($einfo == false) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if ($einfo['order_type'] == 3) {
+        if (in_array($einfo['order_type'], [3, 4])) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $einfo['good_code'], "is_del" => 0])->find();
         } else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -4901,8 +4901,7 @@ class Sale extends Base
                         return app_show(1003, $value['outCode'] . '发货单只能由库管操作');
                     }
                 } else {
-                	if($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==3
-                	||$sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==4 ){
+                	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

@@ -741,7 +741,7 @@ class SupplierClient extends Base {
                 }
                 $addr['addr_cn'] = GetAddr(json_encode($addinfo));
             }
-            if ($value['order_type'] == 3) {
+            if (in_array($value['order_type'], [3, 4])) {
                 $goon = Db::name("good_zixun")->field('id,cat_id')->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
             } else {
                 $goon = Db::name('good_platform')->field('a.id,b.cat_id')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $value['skuCode']])->find();

app/command/NowReportHandle.php

@@ -906,7 +906,7 @@ class NowReportHandle extends Command
              $value['一级分类'] = isset($cat[0]['name']) ? $cat[0]['name'] : "";
              $value['二级分类'] = isset($cat[1]['name']) ? $cat[1]['name'] : "";
              $value['三级分类'] = isset($cat[2]['name']) ? $cat[2]['name'] : "";
-			if($value["order_type"]==3){
+            if (in_array($value["order_type"], [3, 4])) {
 				$good =Db::name("good_zixun")->where(["spuCode"=>$value['商品编号']])->find();
 			}else{
 				$good =Db::name("good")->where(["spuCode"=>$value['商品编号']])->find();