wugg 2 years ago
parent
commit
5383434a4c
2 changed files with 17 additions and 8 deletions
  1. 2 2
      app/admin/controller/Purch.php
  2. 15 6
      app/admin/controller/Sale.php

+ 2 - 2
app/admin/controller/Purch.php

@@ -145,8 +145,8 @@ class Purch extends Base
             }
             
             //采购单详情字段order_type 为1或者2时,取线上商品库 商品创建人   order_type 为3或者4时 取采购反馈的商品库 商品反馈人
-            $value['cgder_id'] = $goon['createrid'];
-            $value['cgder'] = $goon['creater'];
+//            $value['cgder_id'] = $goon['createrid'];
+//            $value['cgder'] = $goon['creater'];
 
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$value['cgdNo'],"is_del"=>0])->select();
             $value['child']=empty($inorder)? [] : $inorder;

+ 15 - 6
app/admin/controller/Sale.php

@@ -69,7 +69,7 @@ class Sale extends Base
         $workNo =isset($this->post['workNo'])&&$this->post['workNo']!=""? trim($this->post['workNo']):"";
        // $poNo =isset($this->post['poNo'])&&$this->post['poNo']!=""? trim($this->post['poNo']):"";
         $ct = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
-            ->where(['a.skuCode' => $good_code])->find();
+            ->where(['a.skuCode' => $good_code])->field("b.*,a.skuCode,a.platform_code,a.plat_code")->find();
             if ($ct == false) {
                 return error_show(1002, "未找到商品数据");
             }
@@ -141,6 +141,8 @@ class Sale extends Base
             "good_num"=>$good_num,
             "good_type"=>$goodtype,
             "order_type"=>$is_stock==1?1:2,
+            "createrid"=>$ct['createrid'],
+            "creater"=>$ct['creater'],
             'send_way'=>2
 
         ];
@@ -690,6 +692,8 @@ class Sale extends Base
             "mark_fee"=>$zxinfo['mark_fee'],
             "demo_fee"=>$zxinfo['demo_fee'],
             "good_num"=>$good_num,
+            "createrid"=>$zxinfo['createrid'],
+            "creater"=>$zxinfo['creater'],
             "good_type"=>1,
             "is_diff"=>$zxinfo['is_diff'],
             "order_type"=>3,
@@ -798,8 +802,8 @@ class Sale extends Base
                         "send_way"=>$zxinfo['send_way'],
                         "status"=>1,
                         "is_del"=>0,
-                        "createrid"=>$rm,
-                        "creater"=>$ri,
+                        "createrid"=>$zxinfo['createrid'],
+                        "creater"=>$zxinfo['creater'],
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
@@ -1050,6 +1054,8 @@ class Sale extends Base
             "mark_fee"=>$goodinfo['mark_fee'],
             "demo_fee"=>$goodinfo['demo_fee'],
             "good_num"=>$data['good_num'],
+            "createrid"=>$goodinfo['createrid'],
+            "creater"=>$goodinfo['creater'],
             "good_type"=>1,
             "order_type"=>4,
             "send_way"=>$goodinfo['send_way'],
@@ -1135,8 +1141,8 @@ class Sale extends Base
                 "send_way"=>$goodinfo['send_way'],
                 "status"=>1,
                 "is_del"=>0,
-                "createrid"=>0,
-                "creater"=>'',
+                "createrid"=>$goodinfo['createrid'],
+                "creater"=>$goodinfo['creater'],
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
@@ -1237,7 +1243,8 @@ class Sale extends Base
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function project_good($data){
-        $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->find();
+        $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->field("b.*,a.skuCode,a.platform_code,a.plat_code")->find();
         if($good==false){
             return false;
         }
@@ -1306,6 +1313,8 @@ class Sale extends Base
                 "demo_fee"=>$good['demo_fee'],
                 "good_num"=>$data['good_num'],
                 "good_type"=>1,
+                "createrid"=>$good['createrid'],
+                "creater"=>$good['creater'],
                 "order_type"=>$good['is_stock']==1?1:2,
                 'send_way'=>2
             ];