细节优化，拆单脚本优化

app/admin/controller/Filing.php

@@ -301,7 +301,7 @@ class Filing extends Base
     //转单
     public function transfer()
     {
-        if($this->level==1) return json_show(1004,'超管不允许操作');
+        if ($this->level == 1) return json_show(1004, '超管不允许操作');
 
         $param = $this->request->only(['id', 'addr_list'], 'post');
 
@@ -341,6 +341,8 @@ class Filing extends Base
         $userCommon = new \app\admin\common\User();
         $supplier = $userCommon->handle('sInfo', ['code' => $filing['supplierNo']]);
 
+//        $names = $userCommon->handle('getCodeAndName', ['code' => [$filing['companyCode'], $filing['customerCode'],]]);
+
         //level3账号都可以操作
         //level2账号的话，只有供应商负责人能操作
         if (($this->level == 2) && ($this->uid != $supplier['data']['personid'])) return json_show(1004, '只有供应商负责人才能操作');
@@ -370,6 +372,7 @@ class Filing extends Base
                     'tax' => $filing['tax'],
                     'platform_id' => $filing['platform_id'],
                     'supplierNo' => $filing['supplierNo'],
+                    'supplierName' => $supplier['data']['name'],
                     'is_auth' => 0,
                     'craft_desc' => $filing['good_name'],
                     'good_remark' => '',
@@ -425,7 +428,11 @@ class Filing extends Base
                 'activity_code' => '',
                 'is_stock' => 0,
                 'customer_code' => $filing['companyCode'],
+                'customerName' => $filing['companyName'],
                 'supplierNo' => $filing['customerCode'],
+                'supplierName' => $filing['customerName'],
+                'supNo' => $filing['supplierNo'],
+                'supName' => $filing['supplierName'],
                 'zxNo' => '',
                 'platform_order' => '',
                 'send_num' => 0,
@@ -511,6 +518,7 @@ class Filing extends Base
                 'supplierNo' => $filing['supplierNo'],
                 'supplier_name' => $filing['supplierName'],
                 'companyNo' => $filing['customerCode'],
+                'companyName' => $filing['customerName'],
                 'send_status' => 1,
                 'send_num' => '0',
                 'wsend_num' => $filing['num'],

app/admin/controller/Purch.php

@@ -820,7 +820,7 @@ class Purch extends Base
 
 			        if($status == 1){
                         //如果开通了供应商账号，则只允许level3账号操作，level2账号不允许操作
-                        if (isset($all_has_supplier_account['data'][$info[$vlue]['supplierNo']]) && $this->level == 2) throw new Exception('已开通供应商账号，当前账号不能操作');
+                        if (isset($all_has_supplier_account[$info[$vlue]['supplierNo']]) && $this->level == 2) throw new Exception('已开通供应商账号，当前账号不能操作');
 //                        if($this->level == 2 && $uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('只能由供应商负责人来操作');//与供应商确认的这个操作，只能由供应商负责人来操作
                     }
 

app/admin/controller/Sale.php

@@ -4848,15 +4848,15 @@ class Sale extends Base
             ])->column('c.supplierNo', 'a.outCode');
 
         //检查这些供应商编码是否开通了账号
-        $temp_res = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
-            ->whereIn('supplierNo', array_values($suppliers))
-            ->column('supplierNo');
-        $temp = [];
-        foreach ($suppliers as $k => $v) {
-            if (in_array($v, $temp_res)) $temp[] = $k;
-        }
-
-        if (!empty($temp)) return json_show(1003, '不允许处理已开通账号的供应商的单子', $temp);
+//        $temp_res =
+//            ->whereIn('supplierNo', array_values($suppliers))
+//            ->column('supplierNo');
+//        $temp = [];
+//        foreach ($suppliers as $k => $v) {
+//            if (in_array($v, $temp_res)) $temp[] = $k;
+//        }
+//
+//        if (!empty($temp)) return json_show(1003, '不允许处理已开通账号的供应商的单子', $temp);
 
 
 
@@ -4912,10 +4912,10 @@ class Sale extends Base
 		                              ->value('personid');
 	                }
 
-	                if ($createrid != $personid) {
-		                Db::rollback();
-		                return app_show(1003, $value['outCode'] . '发货单只能由供应商负责人操作');
-	                }
+//	                if ($createrid != $personid) {
+//		                Db::rollback();
+//		                return app_show(1003, $value['outCode'] . '发货单只能由供应商负责人操作');
+//	                }
                 }
 
                 //【发货单】

app/admin/controller/SupplierClient.php

@@ -702,7 +702,7 @@ class SupplierClient extends Base {
             ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
             ->where($where)
             ->where($condition)
-            ->count();
+            ->count('a.id');
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('order_out')
@@ -714,7 +714,7 @@ class SupplierClient extends Base {
             ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.customer_code,'' companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,wpo.supplierNo,n.supplierNo wsm_supplierNo")
             ->where($where)
             ->where($condition)
-            ->order("addtime desc")
+            ->order(["addtime" => "desc", 'id' => 'desc'])
             ->page($page, $size)
             ->select()
             ->toArray();

app/command/SplitSale.php

@@ -174,8 +174,9 @@ class SplitSale extends Command
                         if (isset($this->cgd_insert[$this->cgd_key - 1])) {
 
                             if (strtoupper($pay_rate['companyNo']) == 'KH') continue;
-                            elseif (strtoupper($pay_rate['companyNo']) == 'GYS') $supplierNo = $sale['supplierNo'];
-                            else $supplierNo = $pay_rate['companyNo'];
+                            else $supplierNo = $pay_rate['supplierNo'];
+//                            elseif (strtoupper($pay_rate['companyNo']) == 'GYS') $supplierNo = $sale['supplierNo'];
+//                            else $supplierNo = $pay_rate['companyNo'];
 
 //                            $supplier = Db::name('supplier')
 //                                ->field('id,code,name,person,personid')
@@ -184,7 +185,7 @@ class SplitSale extends Command
                             $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'] = $names['data'][$supplierNo] ?? '';
+                            $this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $pay_rate['supplierName'];
                             $this->cgd_insert[$this->cgd_key - 1]['supplier_persion'] = $supplier['person'] ?? '';
                             $this->cgd_insert[$this->cgd_key - 1]['supplier_persionid'] = $supplier['personid'] ?? 0;
                         }