ad

app/admin/controller/Purch.php

@@ -166,11 +166,15 @@ class Purch extends Base
         $im = Db::name('purchease_back')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
         $var=[];
         foreach ($im as $value){
-            $goon = Db::name('good_basic')->where(['spuCode'=>$value['good_code']])->field("cat_id")->find();
-            if(empty($goon)){
-                return error_show(1002,"未找到商品数据");
+            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();
+            }
+            if($goo==false) {
+                return error_show(1002, "未找到商品数据");
             }
-            $cat= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
+            $cat= isset($goo['cat_id']) && $goo['cat_id'] !=0 ? made($goo['cat_id']):[];
             $value['cant']=$cat;
             $var[]=$value;
         }
@@ -558,7 +562,13 @@ class Purch extends Base
             return error_show(1002,"未找到采购工差单数据");
         }
         $dn = Db::name('purchease_order')->where(['cgdNo'=>$idinf['cgdNo'],'is_del'=>0])->find();
-        $goon = Db::name('good')->where(['spuCode'=>$idinf['good_code']])->find();
+
+        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();
+        }
+//        $goon = Db::name('good')->where(['spuCode'=>$idinf['good_code']])->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }
@@ -578,7 +588,6 @@ class Purch extends Base
             $idinf['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             $idinf['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
             $idinf['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
-            // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $idinf['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
             $idinf['addr_cn'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
             $idinf['wsm_addr']=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";

app/admin/controller/Sale.php

@@ -2438,7 +2438,6 @@ class Sale extends Base
                     Db::commit();
                     return app_show(0, "更新成功");
                 }
-
             }
                 Db::rollback();
                 return error_show(1003, "更新失败");
@@ -2462,11 +2461,26 @@ class Sale extends Base
         if ($id === "") {
             return error_show(1004, "参数id不能为空");
         }
-        $info = Db::name('sale_diff')->alias('a')->join("good b", "b.good_code=a.good_kode", "left")->where
-        (["a.id" => $id])->field("a.*,b.cat_id")->find();
+        $info = Db::name('sale_diff')->where(["id" => $id])->find();
         if (empty($info)) {
-            return error_show(1004, "订单数据未找到");
+            return error_show(1004, "工差订单数据未找到");
+        }
+        $einfo = Db::name('sale')->where(['orderCode' => $info['orderCode'], 'is_del' => 0])->find();
+        if ($einfo==false) {
+            return error_show(1002, "未找到销售订单数据");
+        }
+        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();
+        }
+        if($goon==false){
+            return error_show(1002, "未找到商品数据");
         }
+        $info['skuCode'] =isset($goon['skuCode']) ? $goon['skuCode']:"";
+        $info['spuCode'] =isset($goon['spuCode']) ? $goon['spuCode']:"";
+        $info['order_type'] =isset($einfo['order_type']) ? $einfo['order_type']:"";
         $info['can'] = isset($info['cat_id']) && $info['cat_id'] !== 0 ? made($info['cat_id']) : [];
         return app_show(0, "获取成功", $info);
     }