Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -2238,7 +2238,7 @@ class Sale extends Base
             ->cursor();
         $data = [];
         foreach ($list as $value) {
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3||$value['order_type'] == 4) {
                 $var = Db::name("good_zixun")->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
                 $value["speclist"] = isset($var['specinfo']) && $var['specinfo'] != "" ? json_decode($var['specinfo'], true) : "";
             } else {
@@ -2453,7 +2453,7 @@ class Sale extends Base
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if ($einfo['order_type'] == 3) {
+        if ($einfo['order_type'] == 3||$einfo['order_type'] == 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')->where(['a.skuCode' => $einfo['skuCode']])->find();
@@ -3253,7 +3253,7 @@ class Sale extends Base
 
         $data = [];
         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['good_code'], "is_del" => 0])->find();
             } else {
                 $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -3459,7 +3459,7 @@ class Sale extends Base
         if ($einfo == false) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if ($einfo['order_type'] == 3) {
+        if ($einfo['order_type'] == 3||$einfo['order_type'] == 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')
@@ -3624,7 +3624,7 @@ class Sale extends Base
                  }
                 $addr['addr_cn'] =GetAddr(json_encode($addinfo));
             }
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3||$value['order_type'] == 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();
@@ -3660,7 +3660,7 @@ class Sale extends Base
             return error_show(1002, "未找到出库数据");
         }
         $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        if ($item['order_type'] == 3) {
+        if ($item['order_type'] == 3||$item['order_type'] == 4) {
             $goodinfo = Db::name("good_zixun")->where(["spuCode" => $item['good_code'], "is_del" => 0])->find();
             if ($goodinfo == false) {
                 return error_show(1004, "未找到商品数据");
@@ -4038,7 +4038,7 @@ class Sale extends Base
                 if (!in_array($own_roleid, config('app.wsm_cgder_role'))) throw new \think\Exception('库存品只能由库管人员操作');
             } elseif ($einfo['is_stock'] == 0 || $einfo['order_type'] == 3) {
                 //非库存品和采返商品只能由供应商负责人操作
-	            if($einfo['order_type'] == 3){
+	            if($einfo['order_type'] == 3||$einfo['order_type'] == 4){
 		            $personid = Db::name('good_zixun')->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
 		                          ->where(['a.spuCode' => $einfo['good_code'], 'a.is_del' => 0])
 		                          ->value('personid');
@@ -4614,7 +4614,7 @@ class Sale extends Base
 
         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')
@@ -4811,7 +4811,7 @@ 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');