wugg 2 tahun lalu
induk
melakukan
0572dec707
2 mengubah file dengan 7 tambahan dan 6 penghapusan
  1. 1 0
      app/admin/controller/Good.php
  2. 6 6
      app/admin/controller/Purch.php

+ 1 - 0
app/admin/controller/Good.php

@@ -501,6 +501,7 @@ class Good extends Base
             $unit = Db::name("unit")->where(['id'=>$value['good_unit']])->find();
             $temp['unit'] = isset($unit['unit'])?$unit['unit']:"";
             $temp['sort_f']=isset($value['cat_id'])?made($value['cat_id']):[];
+            $temp['sort_f']=implode('/',array_column($temp['sort_f'],'name'));//由于这个字段原样在页面显示,所以在这里特意拼接成字符串
             $temp['attribute']=$value['craft_desc'];
             $temp['addtime']=$value['addtime'];
             $temp['usable_stock'] = isset($value['usable_stock'])? $value['usable_stock']:"";

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

@@ -467,20 +467,20 @@ class Purch extends Base
                 $orderCode = Db::name("order_num")->where([["cgdNo","=",$cg['cgdNo']],["status","=",1]])->column("orderCode");
 
                 if(!empty($orderCode)){
-                    $order = Db::name("sale")->where(["orderCode"=>$orderCode])->select()->toArray();
+                    $order = Db::name("sale")->where("orderCode", 'in', $orderCode)->select()->toArray();
                     if(empty($order)){
                         Db::rollback();
                         return error_show(1002,"未找到确认单信息");
                     }
                     foreach ($orderCode as $value){
                         $data=[
-                            "orderCode"=>$value['orderCode'],
-                            "good_code"=>$value['spuCode'],
                             "cgd_diffid"=>$item,
-                            "good_name"=>$value['good_name'],
+                            "orderCode"=>$value,
+                            "good_code"=>$cg['spuCode'],
+                            "good_name"=>$cg['good_name'],
                             "diff_weight"=>$diff_weight,
-                            "diff_price"=>$diff_weight*$value['good_price'],
-                            "gold_price"=>$value['good_price'],
+                            "diff_price"=>$diff_weight*$cg['good_price'],
+                            "gold_price"=>$cg['good_price'],
                             "status"=>1,
                             "addtime"=>date("Y-m-d H:i:s"),
                             "updatetime"=>date("Y-m-d H:i:s")