再添加order_type

app/abutment/controller/Order.php

@@ -159,7 +159,7 @@ class Order extends HomeBaseController
                 $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
                 $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
             }
-            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) : "";
             } else {
@@ -217,7 +217,7 @@ class Order extends HomeBaseController
         $im = Db::name('purchease_back')->where(['cgdNo' => $data['cgdNo'], 'is_del' => 0])->select();
         $var = [];
         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();
             } else {
                 $goo = Db::name('good_basic')->where(['spuCode' => $value['spuCode']])->find();
@@ -231,7 +231,7 @@ class Order extends HomeBaseController
         }
         //采购工差单
         $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();
         } else {
             $goon = Db::name('good_basic')->where(['spuCode' => $data['spuCode']])->find();

app/admin/controller/Purch.php

@@ -966,7 +966,7 @@ class Purch extends Base
         }
         $dn = Db::name('purchease_order')->where(['cgdNo'=>$idinf['cgdNo'],'is_del'=>0])->find();
 
-        if($dn['order_type']==3){
+        if($dn['order_type']==3||$dn['order_type']==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();
@@ -1147,7 +1147,7 @@ class Purch extends Base
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3||$value['order_type'] == 4) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,tax')