Merge branch 'master-new' into master-new-wgg

app/admin/controller/Cat.php

@@ -165,7 +165,7 @@ class Cat extends Base
                 ->toArray();
 
             $value['im'] = $temp;
-            $value['company_name'] = $item[$value['createrid']];
+            $value['company_name'] = $item[$value['createrid']] ?? '';
             $var[] = $value;
         }
         return app_show(0, '获取成功', ['list' => $var, 'count' => $count]);

app/admin/controller/Consult.php

@@ -2201,6 +2201,9 @@ class Consult extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["bo.createrid", 'in', get_company_item_user_by_name($company_name)];
 
+        $relaComNo = trim($this->post['relaComNo']??'');
+        if ($relaComNo !== "") $where[] = ["b.companyNo", '=', $relaComNo];
+
 //        $role=$this->checkRole();
 //        if(!empty($role['write'])){
 //            $where[]=["bo.createrid","in",$role['write']];
@@ -2216,13 +2219,16 @@ class Consult extends Base
 
         $count=Db::name("bargain_order")
             ->alias('bo')
+            ->leftJoin('consult_order b','b.zxNo=bo.zxNo')
             ->where($where)
-            ->count();
+            ->count('bo.id');
 
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('bargain_order')
             ->alias('bo')
+            ->field('bo.*,b.companyNo')
+            ->leftJoin('consult_order b','b.zxNo=bo.zxNo')
             ->where($where)
             ->page($page, $size)
             ->order('bo.addtime', 'desc')
@@ -2232,8 +2238,12 @@ class Consult extends Base
         $all_createrid = array_column($list,'createrid');
         $item = get_company_name_by_uid($all_createrid);
 
+        $userCommon = new \app\admin\common\User();
+        $names = $userCommon->handle('getCodeAndName',['code'=>array_column($list,'companyNo')]);
+
         $data=[];
         foreach ($list as $value){
+            $value['companyName'] = $names['data'][$value['companyNo']]??'';
            $bidinfos =   Db::name("consult_bids")->where([["bidNo","=",$value['bidsNo']],["is_del","=",0]])->find();
            $value['spuCode'] = isset($bidinfos['spuCode'])?$bidinfos['spuCode']:"";
            $value['good_name'] = isset($bidinfos['good_name'])?$bidinfos['good_name']:"";

app/admin/controller/GoodOfflineLog.php

@@ -22,7 +22,7 @@ class GoodOfflineLog extends Base
         if ($param['good_name'] != '') $where[] = ['a.good_name', 'like', '%' . $param['good_name'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
+//        if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["createrid", "in", $role[DataGroupModel::$type_全部]];
 
@@ -36,9 +36,13 @@ class GoodOfflineLog extends Base
             }
         }
 
-        $count = Db::name('good_offline_log')->alias("a")->leftJoin("good_basic b","a.spuCode=b.spuCode")->where
-        ($where)->count('a.id');
-        $list = Db::name('good_offline_log')->alias("a")
+        $count = Db::name('good_offline_log')
+            ->alias("a")
+            ->leftJoin("good_basic b","a.spuCode=b.spuCode")
+            ->where($where)
+            ->count('a.id');
+        $list = Db::name('good_offline_log')
+            ->alias("a")
             ->field('a.id,a.spuCode,a.good_name,a.creater,a.addtime,a.createrid,b.companyNo,b.supplierNo')
             ->leftJoin("good_basic b","a.spuCode=b.spuCode")
             ->where($where)
@@ -57,7 +61,7 @@ class GoodOfflineLog extends Base
 		 	$value['companyName'] = $supplierInfo["data"][$value['companyNo']]??"";
 		 	$value['supplierName'] = $supplierInfo["data"][$value['supplierNo']]??"";
 		 }
-        return app_show(0, "获取成功", ['list' => $list, 'count' => $count]);
+        return json_show(0, "获取成功", ['list' => $list, 'count' => $count]);
 
     }
 

app/admin/controller/Platform.php

@@ -107,17 +107,17 @@ class Platform extends Base
 
                 $userCommon = new \app\admin\common\User();
                 $company_names = $userCommon->handle('getCodeAndName', ['code' => array_column($param['pay_list'], 'companyNo')]);
-                if (!isset($company_names['code']) || $company_names['code'] != 0) throw new Exception($company_names['message']);
+//                if (!isset($company_names['code']) || $company_names['code'] != 0) throw new Exception($company_names['message']);
 
                 $weight = 0;
                 $insert_da = [[
                     'platform_id' => $platform_id,
-                    'companyNo' => 'KH',
-                    'companyName' => '客户',
+                    'companyNo' => 'GYS',
+                    'companyName' => '供应商',
                     'rate' => 0,
                     'is_cgd' => 0,
-                    'is_qrd' => 0,
-                    'weight' => $weight,
+                    'is_qrd' => 1,
+                    'weight' => $weight++,
                     'status' => 1,
                     'is_del' => 0,
                     "addtime" => $date,
@@ -128,7 +128,7 @@ class Platform extends Base
                         'platform_id' => $platform_id,
                         'companyNo' => $pay['companyNo'],
                         'companyName' => $company_names['data'][$pay['companyNo']] ?? '',
-                        'rate' => $pay['rate'],
+                        'rate' => round($pay['rate'] / 100, 2),
                         'is_cgd' => 1,
                         'is_qrd' => 1,
                         'weight' => $weight++,
@@ -141,11 +141,11 @@ class Platform extends Base
 
                 $insert_da[] = [
                     'platform_id' => $platform_id,
-                    'companyNo' => 'GYS',
-                    'companyName' => '供应商',
+                    'companyNo' => 'KH',
+                    'companyName' => '客户',
                     'rate' => 0,
                     'is_cgd' => 0,
-                    'is_qrd' => 1,
+                    'is_qrd' => 0,
                     'weight' => $weight++,
                     'status' => 1,
                     'is_del' => 0,
@@ -363,19 +363,23 @@ class Platform extends Base
 
             if ($param['is_select_pay_rate'] == 1) {
 
+                $userCommon = new \app\admin\common\User();
+                $company_names = $userCommon->handle('getCodeAndName', ['code' => array_column($param['pay_list'], 'companyNo')]);
+
                 Db::name('platform_pay_rate')
                     ->where(['is_del' => 0, 'platform_id' => $param['id']])
                     ->update(['is_del' => 1, 'updatetime' => $date]);
 
                 $weight = 0;
+
                 $insert_da = [[
                     'platform_id' => $param['id'],
-                    'companyNo' => 'KH',
-                    'companyName' => '客户',
+                    'companyNo' => 'GYS',
+                    'companyName' => '供应商',
                     'rate' => 0,
                     'is_cgd' => 0,
-                    'is_qrd' => 0,
-                    'weight' => $weight,
+                    'is_qrd' => 1,
+                    'weight' => $weight++,
                     'status' => 1,
                     'is_del' => 0,
                     "addtime" => $date,
@@ -386,7 +390,7 @@ class Platform extends Base
                         'platform_id' => $param['id'],
                         'companyNo' => $pay['companyNo'],
                         'companyName' => $company_names['data'][$pay['companyNo']] ?? '',
-                        'rate' => $pay['rate'],
+                        'rate' => round($pay['rate'] / 100, 2),
                         'is_cgd' => 1,
                         'is_qrd' => 1,
                         'weight' => $weight++,
@@ -399,11 +403,11 @@ class Platform extends Base
 
                 $insert_da[] = [
                     'platform_id' => $param['id'],
-                    'companyNo' => 'GYS',
-                    'companyName' => '供应商',
+                    'companyNo' => 'KH',
+                    'companyName' => '客户',
                     'rate' => 0,
                     'is_cgd' => 0,
-                    'is_qrd' => 1,
+                    'is_qrd' => 0,
                     'weight' => $weight++,
                     'status' => 1,
                     'is_del' => 0,

app/admin/controller/Reorder.php

@@ -492,6 +492,9 @@ class Reorder extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
+        $customer_code = trim($this->post['customer_code']??'');
+        $where[]=['b.customer_code', "like", "%{$customer_code}%"];
+
         $count=Db::name("sale_return")
             ->alias('sr')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")

app/admin/controller/Sale.php

@@ -3257,9 +3257,9 @@ class Sale extends Base
         if ($supplierNo != "") {
             $where[] = ['c.supplierNo', "like", "%$supplierNo%"];
         }
-        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
-        if ($companyNo != "") {
-            $where[] = ['c.customer_code', "like", "%$companyNo%"];
+        $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] !== "" ? trim($this->post['customer_code']) : "";
+        if ($customer_code != "") {
+            $where[] = ['c.customer_code', "like", "%$customer_code%"];
         }
         //  $role=$this->checkRole();
 //        if(!empty($role['write'])){

app/command/SplitSale.php

@@ -2,6 +2,7 @@
 
 namespace app\command;
 
+use app\admin\common\User;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
@@ -55,6 +56,8 @@ class SplitSale extends Command
 
 //                $cgd_insert_tmp_data=[];
 
+                $userCommon = new User();
+
                 foreach ($data as $sale) {
 
                     //补充商品信息
@@ -112,10 +115,12 @@ class SplitSale extends Command
                     //采购总金额和销售总金额
                     $cgd_total = $sale_total = $sale['total_price'];
 
+                    $names = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($pay_rates, 'companyNo'), [$sale['customer_code'], $sale['supplierNo']]))]);
+
                     //客户
-                    $customer = ['No' => $sale['customer_code'], 'name' => Db::name('customer_info')->where('companyNo', $sale['customer_code'])->value('companyName', '')];
+                    $customer = ['No' => $sale['customer_code'], 'name' => $names['data'][$sale['customer_code']] ?? ''];
                     //供应商
-                    $supplier = ['No' => $sale['supplierNo'], 'name' => Db::name('business')->where('companyNo', $sale['supplierNo'])->value('company', '')];
+                    $supplier = ['No' => $sale['supplierNo'], 'name' => $names['data'][$sale['supplierNo']] ?? ''];
 
                     foreach ($pay_rates as $pay_rate) {
 
@@ -142,10 +147,10 @@ class SplitSale extends Command
                             //只处理销售单
 
                             //供应商事先覆盖
-                            $supplier = ['No' => $sale['supplierNo'], 'name' => Db::name('business')->where('companyNo', $sale['supplierNo'])->value('company', '')];
+                            $supplier = ['No' => $sale['supplierNo'], 'name' => $names['data'][$sale['supplierNo']] ?? ''];
                             if ($pay_rate['is_qrd'] == 1) {
                                 //此时生成的供应商的销售单，应该关联原始采购单号
-                                $this->_handle_sale_caixiao($sale, $orderCode, $cgd['cgdNo'], $sale_total, $customer, $supplier);
+                                $this->_handle_sale_caixiao($sale, $orderCode, $cgd['cgdNo'] ?? '', $sale_total, $customer, $supplier);
                             }
 
                         } else {
@@ -171,25 +176,27 @@ class SplitSale extends Command
                             elseif (strtoupper($pay_rate['companyNo']) == 'GYS') $supplierNo = $sale['supplierNo'];
                             else $supplierNo = $pay_rate['companyNo'];
 
-                            $supplier = Db::name('supplier')
-                                ->field('id,code,name,person,personid')
-                                ->where('code', $supplierNo)
-                                ->findOrEmpty();
+//                            $supplier = Db::name('supplier')
+//                                ->field('id,code,name,person,personid')
+//                                ->where('code', $supplierNo)
+//                                ->findOrEmpty();
+                            $temp = $userCommon->handle('sInfo', ['code' => $supplierNo]);
+                            $supplier = $temp['data'] ?? [];
                             $this->cgd_insert[$this->cgd_key - 1]['supplierNo'] = $supplierNo;
-                            $this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $supplier['name'] ?? '';
+                            $this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $names['data'][$supplierNo] ?? '';
                             $this->cgd_insert[$this->cgd_key - 1]['supplier_persion'] = $supplier['person'] ?? '';
                             $this->cgd_insert[$this->cgd_key - 1]['supplier_persionid'] = $supplier['personid'] ?? 0;
                         }
 
                     }
-                    
+
                     //清空该变量，以防止多个销售单覆盖数据的情况
 //                    $cgd_insert_tmp_data = array_merge($cgd_insert_tmp_data, $this->cgd_insert);
 
                     //批量新增改为单次新增
                     if ($this->cgd_insert) Db::name('cgd_caixiao')->insertAll($this->cgd_insert);
-                    $this->cgd_insert=[];
-                    $this->cgd_key=0;
+                    $this->cgd_insert = [];
+                    $this->cgd_key = 0;
                 }
 
 //                if ($cgd_insert_tmp_data) Db::name('cgd_caixiao')->insertAll($cgd_insert_tmp_data);
@@ -285,7 +292,7 @@ class SplitSale extends Command
                 'noble_weight' => $sale['noble_weight'] ?? 0,
                 'tax' => $sale['tax'] ?? '',
                 'lead_time' => $sale['lead_time'] ?? 0,
-                'depart' => get_company_name_by_uid($sale['apply_id'] ?? 0) ?? '',
+                'depart' => isset($sale['apply_id']) ? get_company_name_by_uid($sale['apply_id']) : '',
                 'cgdNo' => $cgdNo,
                 'pay_id' => $sale['pay_id'],
                 'oldCode' => $sale['orderCode'],
@@ -344,8 +351,7 @@ class SplitSale extends Command
                 'wsm_code' => $cgd['wsm_code'] ?? '',
                 'cgder' => $sale['cgder'] ?? '',
                 'cgder_id' => $sale['cgderid'] ?? 0,
-                'depart' => get_company_name_by_uid($cgd['cgder_id'] ?? 0) ?? '',
-                'qrdNo' => $orderCode,
+                'depart' => isset($cgd['cgder_id']) ? get_company_name_by_uid($cgd['cgder_id']) : '', 'qrdNo' => $orderCode,
                 'spuCode' => $cgd['spuCode'] ?? $sale['good_code'],
                 'good_name' => $sale['good_name'],
                 'skuCode' => $cgd['skuCode'] ?? '',