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

app/admin/controller/After.php

@@ -249,6 +249,7 @@ class After extends Base
             'customer_code' => '',
             'companyNo' => '',
             'order_source' => '',
+            'use_type' => '',
         ], 'post', 'trim');
 
         $where = [['a.is_del', "=", 0]];
@@ -268,6 +269,7 @@ class After extends Base
         if ($param['order_source'] !== "") $where[] = ['c.order_source', "=", $param['order_source']];
         if ($param['supplierNo'] !== "") $where[] = ['a.supplierNo', "like", '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] !== "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];
+        if ($param['use_type'] !== '') $where[] = ['p.use_type', '=', $param['use_type']];
 
 
         $condition = [];
@@ -301,6 +303,7 @@ class After extends Base
             ->alias("a")
             ->leftJoin("order_returninfo b", "a.returnCode=b.returnCode")
             ->leftJoin("sale c", "c.orderCode=a.orderCode AND c.is_del=0")
+            ->leftJoin('platform p', 'p.id=c.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
@@ -312,11 +315,12 @@ class After extends Base
             ->alias("a")
             ->leftJoin("order_returninfo b", "a.returnCode=b.returnCode")
             ->leftJoin("sale c", "c.orderCode=a.orderCode AND c.is_del=0")
+            ->leftJoin('platform p', 'p.id=c.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
             })
-            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark,c.order_source")
+            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark,c.order_source,p.use_type")
             ->page($param['page'], $param['size'])
             ->order("a.addtime desc")
             ->select()

app/admin/controller/AfterChild.php

@@ -14,14 +14,15 @@ class AfterChild extends Base
     //退货工单列表
     public function getList()
     {
-
-        $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 0, 'type' => '', 'outChildCode' => '', 'return_wsm_code' => '', 'companyNo' => '', 'supplierNo' => '', 'customer_code' => ''], 'post', 'trim');
+        $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 0, 'type' => '', 'outChildCode' => '', 'return_wsm_code' => '', 'companyNo' => '', 'supplierNo' => '', 'customer_code' => '','use_type'=>''], 'post', 'trim');
 
         $db = Db::name('order_return_child')
             ->alias('a')
             ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
             ->leftJoin('order_return d', 'd.returnCode=a.returnCode and d.is_del=0')
+            ->leftJoin('sale e','e.orderCode=a.orderCode AND e.is_del=0')
+            ->leftJoin('platform p', 'p.id=e.platform_id AND p.is_del=0')
             ->where('a.is_del', 0);
 
         if ($param['returnCode'] != '') $db->whereLike('a.returnCode', '%' . $param['returnCode'] . '%');
@@ -36,6 +37,7 @@ class AfterChild extends Base
         if ($param['companyNo'] !== '') $db->whereLike('d.companyNo', '%' . $param['companyNo'] . '%');
         if ($param['supplierNo'] !== '') $db->whereLike('d.supplierNo', '%' . $param['supplierNo'] . '%');
         if ($param['customer_code'] !== '') $db->whereLike('d.customer_code', '%' . $param['customer_code'] . '%');
+        if ($param['use_type'] !== '') $db->where('p.use_type',  $param['use_type']);
 
         if ($param['is_authority'] == '0' && $param['returnCode'] == '' && $param['orderCode'] == '' && $param['outCode'] == '') return json_show('请选择筛选条件');
 
@@ -68,7 +70,7 @@ class AfterChild extends Base
             ->count('a.id');
 
         $list = $db
-            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name,d.order_type,d.apply_id,d.apply_name,a.type,a.can_sell_num,a.defective_num,a.loss_num,a.return_num_total,d.good_code,d.good_name')
+            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name,d.order_type,d.apply_id,d.apply_name,a.type,a.can_sell_num,a.defective_num,a.loss_num,a.return_num_total,d.good_code,d.good_name,p.use_type')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->select()

app/admin/controller/OrderOutChild.php

@@ -65,6 +65,7 @@ class OrderOutChild extends Base
             'apply_name' => '',
             'order_type' => '',
             'relaComNo' => '',
+            'use_type' => '',
         ], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
@@ -85,6 +86,7 @@ class OrderOutChild extends Base
         if ($param['apply_name'] != '') $where[] = ['a.apply_name', 'like', '%' . $param['apply_name'] . '%'];
         if ($param['order_type'] != '') $where[] = ['a.order_type', '=', $param['order_type']];
         if ($param['relaComNo'] != '') $where[] = ['a.companyNo', '=', $param['relaComNo']];
+        if ($param['use_type'] !== '') $where[] = ['p.use_type', '=', $param['use_type']];
 
         $condition = '';
         //只有level2的账号过滤数据权限
@@ -117,14 +119,18 @@ class OrderOutChild extends Base
         $count = Db::name('order_out_child')
             ->alias('a')
             ->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')
             ->where($where)
             ->where($condition)
             ->count('a.id');
 
         $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')
+            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name,p.use_type')
             ->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')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->where($where)

app/admin/controller/Reorder.php

@@ -506,6 +506,8 @@ 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)];
 
+        $use_type = $this->post['use_type']??'';
+        if($use_type!=='') $where[]=['p.use_type','=',$use_type];
 //        $customer_code = trim($this->post['customer_code']??'');
 //        $where[]=['b.customer_code', "like", "%{$customer_code}%"];
 
@@ -513,6 +515,7 @@ class Reorder extends Base
             ->alias('sr')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->leftJoin('result_info c', 'c.result_code=sr.error_code')
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
             ->where($where)
 //            ->where(function ($query) use ($condition) {
 //                $query->whereOr($condition);
@@ -522,9 +525,10 @@ class Reorder extends Base
         $page = $total >= $page ? $page : $total;
         $list = Db::name("sale_return")
             ->alias('sr')
-            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.order_source,c.result error_msg')
+            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.order_source,c.result error_msg,p.use_type')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->leftJoin('result_info c', 'c.result_code=sr.error_code')
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
             ->where($where)
 //            ->where(function ($query) use ($condition) {
 //                $query->whereOr($condition);

app/admin/controller/ReorderChild.php

@@ -221,7 +221,7 @@ class ReorderChild extends Base
     public function getList()
     {
 
-        $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'outChildCode' => '', 'saleReturnChildCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 1, 'return_wsm_code' => '', 'companyNo' => '', 'customer_code' => ''], 'post', 'trim');
+        $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'outChildCode' => '', 'saleReturnChildCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 1, 'return_wsm_code' => '', 'companyNo' => '', 'customer_code' => '','use_type'=>''], 'post', 'trim');
 
         if ($param['is_authority'] == '0' && $param['returnCode'] == '' && $param['orderCode'] == '' && $param['outCode'] == '' && $param['outChildCode'] == '' && $param['saleReturnChildCode'] == '') return json_show('请选择筛选条件');
 
@@ -229,6 +229,8 @@ class ReorderChild extends Base
             ->alias('a')
             ->leftJoin('sale_return b', 'b.returnCode=a.returnCode and b.is_del=0')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_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')
             ->where('a.is_del', 0);
 
         if ($param['returnCode'] != '') $db->whereLike('a.returnCode', '%' . $param['returnCode'] . '%');
@@ -242,6 +244,7 @@ class ReorderChild extends Base
         if ($param['return_wsm_code'] != '') $db->whereLike('a.return_wsm_code', '%' . $param['return_wsm_code'] . '%');
         if ($param['companyNo'] != '') $db->whereLike('a.companyNo', '%' . $param['companyNo'] . '%');
         if ($param['customer_code'] != '') $db->whereLike('a.customer_code', '%' . $param['customer_code'] . '%');
+        if($param['use_type']!=='') $db->where('p.use_type',$param['use_type']);
 
         //启用数据权限
         if ($param['is_authority'] == 1) {
@@ -272,7 +275,7 @@ class ReorderChild extends Base
         $count = $db->count('a.id');
 
         $list = $db
-            ->field('a.id,a.saleReturnChildCode,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime,b.supplierNo,b.supplierName,a.return_wsm_code,c.name return_wsm_name,c.supplierNo return_supplierNo,c.supplierName return_supplierName,c.contactor_name return_contactor_name,b.order_type,a.orderCode,a.returnCode,b.apply_name,b.apply_id,b.good_code,b.good_name')
+            ->field('a.id,a.saleReturnChildCode,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime,b.supplierNo,b.supplierName,a.return_wsm_code,c.name return_wsm_name,c.supplierNo return_supplierNo,c.supplierName return_supplierName,c.contactor_name return_contactor_name,b.order_type,a.orderCode,a.returnCode,b.apply_name,b.apply_id,b.good_code,b.good_name,p.use_type')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->select()

app/admin/controller/Sale.php

@@ -2091,6 +2091,9 @@ class Sale extends Base
             $end .= " 23:59:59";
             $where[] = ["s.addtime", '<=', $end];
         }
+
+        $use_type = $this->post['use_type']??'';
+        if($use_type!=='') $where[]=['e.use_type','=',$use_type];
 //        $role = $this->checkRole();
 //        if (!empty($role['write'])) {
 //            $where[] = ["s.apply_id", "in", $role['write']];
@@ -2119,22 +2122,24 @@ class Sale extends Base
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
             ->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)
             ->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('sale')
             ->alias('s')
-            ->field('s.*,b.cgdNo,c.order_use useage,d.status cgd_status')
+            ->field('s.*,b.cgdNo,c.order_use useage,d.status cgd_status,e.use_type')
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
             ->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")
             ->page($page, $size)
             ->where($where)
             ->select()
             ->toArray();
-        $all_createrid = array_column($list,'apply_id');
+        $all_createrid = array_unique(array_column($list, 'apply_id'));
         $item = get_company_name_by_uid($all_createrid);
 
 //        $userCommon = \app\admin\common\User::getIns();
@@ -2196,7 +2201,7 @@ class Sale extends Base
 
             $data[] = $value;
         }
-        return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
+        return app_show(0, "获取成功", ['count' => $count, 'list' => $data]);
     }
 
     public function edit()
@@ -3554,12 +3559,16 @@ class Sale extends Base
         $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? intval($this->post['order_source']) : "";
         if ($order_source !== "") $where[] = ["b.order_source", '=', $order_source];
 
+        $use_type = $this->post['use_type']??'';
+        if($use_type!=='') $where[]=['p.use_type','=',$use_type];
+
         $count = Db::name('order_out')
             ->alias('a')
             ->join("sale b", "b.orderCode=a.orderCode", "left")
 //            ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code", "left")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
+            ->leftJoin("platform p", "p.id=b.platform_id")
 //            ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
 //	        ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
             ->where($where)
@@ -3573,9 +3582,10 @@ class Sale extends Base
 //            ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code AND n.is_del=0", "left")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
+            ->leftJoin("platform p", "p.id=b.platform_id")
 //            ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
 //	        ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
-            ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.customer_code,b.supplierNo companyNo,b.supplierName companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,b.supNo supplierNo,n.supplierNo wsm_supplierNo")
+            ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.customer_code,b.supplierNo companyNo,b.supplierName companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,b.supNo supplierNo,n.supplierNo wsm_supplierNo,p.use_type")
             ->where($where)
             ->where($condition)
             ->order("addtime desc")

app/admin/controller/SupplierClient.php

@@ -633,7 +633,6 @@ class SupplierClient extends Base {
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo != "") {
             $where[] = ['b.supplierNo', "like", "%$companyNo%"];
-
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
@@ -704,12 +703,16 @@ class SupplierClient extends Base {
         $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? intval($this->post['order_source']) : "";
         if ($order_source !== "") $where[] = ["b.order_source", '=', $order_source];
 
+        $use_type = $this->post['use_type']??'';
+        if($use_type!=='') $where[]=['p.use_type','=',$use_type];
+
         $count = Db::name('order_out')
             ->alias('a')
             ->join("sale b", "b.orderCode=a.orderCode", "left")
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code", "left")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
             ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
             ->where($where)
             ->where($condition)
             ->count('a.id');
@@ -721,7 +724,8 @@ class SupplierClient extends Base {
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code AND n.is_del=0", "left")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
             ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
-            ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.customer_code,b.supplierNo companyNo,b.supplierName companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,wpo.supplierNo,n.supplierNo wsm_supplierNo")
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
+            ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.customer_code,b.supplierNo companyNo,b.supplierName companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,wpo.supplierNo,n.supplierNo wsm_supplierNo,p.use_type")
             ->where($where)
             ->where($condition)
             ->order(["addtime" => "desc", 'id' => 'desc'])
@@ -790,6 +794,7 @@ class SupplierClient extends Base {
             'customer_code' => '',
             'companyNo' => '',
             'order_source' => '',
+            'use_type' => '',
         ], 'post', 'trim');
 
         $where = [['a.is_del', "=", 0]];
@@ -809,6 +814,7 @@ class SupplierClient extends Base {
         if ($param['supplierNo'] !== "") $where[] = ['a.supplierNo', "like", '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] !== "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];
         if ($param['relaComNo'] !== "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];
+        if ($param['use_type'] !== "") $where[] = ['p.use_type', "=", $param['use_type']];
 
         $condition = [];
 
@@ -845,6 +851,7 @@ class SupplierClient extends Base {
             ->alias("a")
             ->leftJoin("order_returninfo b", "a.returnCode=b.returnCode")
             ->leftJoin("sale c", "c.orderCode=a.orderCode AND c.is_del=0")
+            ->leftJoin('platform p', 'p.id=c.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
@@ -854,11 +861,12 @@ class SupplierClient extends Base {
             ->alias("a")
             ->leftJoin("order_returninfo b", "a.returnCode=b.returnCode")
             ->leftJoin("sale c", "c.orderCode=a.orderCode AND c.is_del=0")
+            ->leftJoin('platform p', 'p.id=c.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
             })
-            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark,c.order_source")
+            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark,c.order_source,p.use_type")
             ->page($param['page'], $param['size'])
             ->order("a.addtime desc")
             ->select()
@@ -1101,9 +1109,13 @@ class SupplierClient 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)];
 
+        $use_type = $this->post['use_type']??'';
+        if($use_type!=='') $where[]=['p.use_type','=',$use_type];
+
         $count=Db::name("sale_return")
             ->alias('sr')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->count('sr.id');
@@ -1111,8 +1123,9 @@ class SupplierClient extends Base {
         $page = $total>=$page ? $page :$total;
         $list = Db::name("sale_return")
             ->alias('sr')
-            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.order_source')
+            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.order_source,p.use_type')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
+            ->leftJoin('platform p', 'p.id=b.platform_id AND p.is_del=0')
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->order("sr.addtime desc")