Merge branch 'master-new-dev' of wugg/phpstock into master-new

app/admin/controller/OrderOutChild.php

@@ -149,7 +149,8 @@ class OrderOutChild extends Base
 
         $list = Db::name('order_out_child')
             ->alias('a')
-            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name,p.use_type,m.cgdNo,d.remark')
+            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,
+            c.contactor_name,p.use_type,m.cgdNo,d.remark,d.platform_order')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
             ->leftJoin('sale d', 'd.orderCode=a.orderCode AND d.is_del=0')
             ->leftJoin('platform p', 'p.id=d.platform_id AND p.is_del=0')
@@ -273,6 +274,7 @@ class OrderOutChild extends Base
             ->field('a.outChildCode 发货工单号,
             a.outCode 发货单编号,
             a.orderCode 销售订单编号,
+            d.platform_order 平台订单号,
             "" 供应商端,
             case a.status when 1 then "待发货" when 2 then "发货完成" when 3 then "已收货" when 4 then "已全部退货" end "状态" ,
             case a.order_type when 1 then "备库" when 2 then "非库存" when 3 then "咨询商品" when 4 then "报备商品" end "商品类型",
@@ -285,7 +287,8 @@ class OrderOutChild extends Base
             a.supplierName 供应商名称,a.addtime 下单时间,
             a.apply_name 申请人,
             case p.use_type when 0 then "无" when 1 then "to B" when 2 then "to C" end 对接类型,
-            a.post_name 物流公司,a.post_code 物流单号,a.post_fee 物流费用,e.addr 收货地址,e.addr_code,e.contactor 收货联系人,e.mobile 联系方式,m.cgdNo 采购单号,d.remark 备注')
+            a.post_name 物流公司,a.post_code 物流单号,a.post_fee 物流费用,e.addr 收货地址,e.addr_code,e.contactor 收货联系人,
+            e.mobile 联系方式,m.cgdNo 采购单号,d.remark 备注')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
             ->leftJoin('order_addr e', 'a.addrid=e.id')
             ->leftJoin('order_send m', 'a.outCode=m.outCode')

app/admin/controller/Sale.php

@@ -2160,9 +2160,6 @@ class Sale extends Base
             $where[] = ['s.supplierNo', "=", $relaComNo];
         }
 
-//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
-//        if ($relaComNo !== '') $where[] = ['s.customer_code', '=', $relaComNo];
-
         $ordertype = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
         if ($ordertype !== "") {
             $where[] = ['s.order_type', "=", $ordertype];
@@ -2185,13 +2182,6 @@ class Sale extends Base
         if($use_type!=='') $where[]=['e.use_type','=',$use_type];
          $platform_id = $this->post['platform_id']??'';
         if($platform_id!=='') $where[]=['s.platform_id','=',$platform_id];
-//        $role = $this->checkRole();
-//        if (!empty($role['write'])) {
-//            $where[] = ["s.apply_id", "in", $role['write']];
-//        }
-
-//        $role = $this->checkDataShare();
-//        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ['s.apply_id', 'in', $role[DataGroupModel::$type_全部]];
         $role = $this->checkDataShare();
         $hand = resign_hand_user($this->uid,0);
         if (!empty($role[DataGroupModel::$type_全部])) {
@@ -2204,14 +2194,11 @@ class Sale extends Base
 
         $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? trim($this->post['order_source']) : "";
         if ($order_source !== "") $where[] = ["s.order_source", '=', $order_source];
-
-//        if(!empty($role['platform']) ){
-//            $where[]=["s.platform_id","in",$role['platform']];
-//        }
+        
         $count = Db::name('sale')
             ->alias('s')
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
-            ->leftJoin('order_use c','c.id=s.use_order')
+//            ->leftJoin('order_use c','c.id=s.use_order')
             ->leftJoin('purchease_order d','d.cgdNo=b.cgdNo')
             ->leftJoin('platform e','e.id=s.platform_id')
             ->where($where)
@@ -2220,9 +2207,9 @@ class Sale extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('sale')
             ->alias('s')
-            ->field('s.*,b.cgdNo,c.order_use useage,d.status cgd_status,e.use_type,e.platform_name')
+            ->field('s.*,b.cgdNo,s.use_order useage,d.status cgd_status,e.use_type,e.platform_name')
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
-            ->leftJoin('order_use c','c.id=s.use_order')
+//            ->leftJoin('order_use c','c.id=s.use_order')
             ->leftJoin('purchease_order d','d.cgdNo=b.cgdNo')
             ->leftJoin('platform e','e.id=s.platform_id')
             ->order("s.addtime desc")
@@ -2232,12 +2219,10 @@ class Sale extends Base
             ->toArray();
         $all_createrid = array_unique(array_column($list, 'apply_id'));
         $item = get_company_name_by_uid($all_createrid);
-
-//        $userCommon = \app\admin\common\User::getIns();
-//        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'customer_code'),array_column($list,'supplierNo'))]);
-
+        $useAddr = \app\admin\model\OrderUse::where(["is_del"=>1])->column("order_use","id");
         $data = [];
         foreach ($list as $value) {
+        	$value['useage'] = $useAddr[$value['useage']]??"";
             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) : "";
@@ -2264,23 +2249,6 @@ class Sale extends Base
             }
 
             $value['can'] = isset($var['cat_id']) && $var['cat_id'] != 0 ? made($var['cat_id']) : [];
-//            $value['supplierName'] = '';
-//            if ($value['supplierNo'] != "") {
-//                $supplier = Db::name("business")->where(["companyNo" => $value['supplierNo']])->find();
-//                $value['supplierName'] = $names['data'][$value['supplierNo']]??'';//isset($supplier['company']) ? $supplier['company'] : "";
-//            }
-//            $value['customerName'] = '';
-//            if ($value['customer_code'] != "") {
-//                $supplier = Db::name("customer_info")->where(["companyNo" => $value['customer_code']])->find();
-//                $value['customerName'] = $names['data'][$value['customer_code']]??'';//isset($supplier['companyName']) ? $supplier['companyName'] : "";
-//            }
-//            $value['useage'] = "";
-//            if ($value['use_order'] != 0) {
-//                $use = Db::name("order_use")->where(["id" => $value['use_order']])->find();
-//                $value['useage'] = isset($use['order_use']) ? $use['order_use'] : "";
-//            } else {
-//                $value['use_order'] = '';
-//            }
             $value['good_num'] -= $value['th_num'];
             $value['send_num'] -= $value['th_num'];
             $value['total_price'] = round($value['total_price'] - $value['th_fee'], 2);

app/command/ImportOrderFromCHandleData.php

@@ -529,6 +529,7 @@ class ImportOrderFromCHandleData extends Command
             "good_num" => $data['good_num'],
             "good_price" => $data['sale_price'],
             "total_fee" => round($data['sale_price'] * $data['good_num'], 2),
+            "origin_total" => round($data['sale_price'] * $data['good_num'], 2),
             "pakge_fee" => $data['pakge_fee'],
             "cert_fee" => $data['cert_fee'],
             "open_fee" => $data['open_fee'],

app/command/handleYzOrderData.php

@@ -538,6 +538,7 @@ class handleYzOrderData extends Command
             "good_num" => $data['good_num'],
             "good_price" => $data['sale_price'],
             "total_fee" => round($data['sale_price'] * $data['good_num'], 2),
+            "origin_total" => round($data['sale_price'] * $data['good_num'], 2),
             "pakge_fee" => $data['pakge_fee'],
             "cert_fee" => $data['cert_fee'],
             "open_fee" => $data['open_fee'],

app/common.php

@@ -470,20 +470,8 @@ if (function_exists('get_cat_data') == false) {
             ->where(['id' => $var])
             ->findOrEmpty();
         if (empty($str)) return [];
-
-//        $vmn =[];
-//        $vmn['id'] =$str['id'];
-//        $vmn['name'] =$str['cat_name'];
         array_unshift($data, ['id' => $str['id'], 'name' => $str['cat_name']]);
-        // $var['id']=made();
-
         return $str['pid'] == 0 ? $data : get_cat_data($str['pid'], $data);
-//        if($str['pid']==0){
-//            // krsort($data);
-//            return $data;
-//        }else{
-//            return get_cat_data($str['pid'],$data);
-//        }
     }
 }