edit

app/Http/Controllers/Orders/OrdersController.php

@@ -1267,7 +1267,7 @@ class OrdersController extends BaseController
             $returnSettlementThree = SettlementThree::where('sys_num', $input['sys_num'])->update($orderSetteArr);
             $get['status'] = 50;
             OrderAfter::where('sys_num', $input['sys_num'])->where('status', '<', 40)->update($get);
-            $older = OrderService::getOrderBy('sys_num', $input['sys_num'],['order_status', 'sys_num', 'order_num', 'create_time', 'p_id','ser_id','store_type','category']);
+            $older = OrderService::getOrderBy('sys_num', $input['sys_num'],['order_status', 'sys_num', 'order_num', 'create_time', 'p_id','ser_id','store_type','category','company_id']);
             if ($returnOrder) {
                 $ser_id = $older['ser_id'];
                 if (!empty($ser_id) && $ser_id != 0) {
@@ -1314,6 +1314,24 @@ class OrdersController extends BaseController
                     }
                 }
                 /***************半径推送******************************/
+                /*******************************************撤销订单回收库存*****************************************/
+                if($older['order_status']>10) {
+                    $goodid = DB::table('order_msg')->where('sys_num', $older['sys_num'])->whereNotIn('goods_service', [2, 3])->select('goods_id', 'goods_num')->get()->toArray();
+                    //库存有关
+                    if ($goodid) {
+                        $gsql = "";
+                        $sql = "INSERT INTO `gone_invenrecor`( `iv_serid`, `iv_goodid`, `iv_num`,`iv_serial`,`iv_ordernum`,`iv_company_id`) VALUES";
+                        foreach ($goodid as $kgi => $vgi) {
+                            $gsql .= "UPDATE `gone_inventory` SET `inv_num`=`inv_num`+" . $vgi['goods_num'] . " WHERE `inv_serid`='" . $older['ser_id'] . "' and `inv_goodid`='" . $vgi['goods_id'] . "' and `inv_company_id`='" . $older['company_id'] . "';";
+                            $sql .= "('" . $older['ser_id'] . "','" . $vgi['goods_id'] . "','+" . $vgi['goods_num'] . "','" . $older['serial_number'] . "','" . $older['order_num'] . "','" . $older['company_id'] . "'),";
+                        }
+
+                        $sql = trim($sql, ',');
+                        DB::insert($sql);
+                        DB::update($gsql);
+                    }
+                }
+                /*******************************************撤销订单回收库存*****************************************/
                 DB::commit();
 //                OrderService::sysWarehouseCancel($input['sys_num']);
                 if ($older['order_status'] < 20) {

app/Services/SupplierPriceService.php

@@ -15,6 +15,7 @@ namespace App\Services;
 
 use App\Models\GhPrice;
 use BlueCity\Core\Service\Service;
+use DB;
 
 
 class SupplierPriceService extends Service
@@ -86,13 +87,13 @@ class SupplierPriceService extends Service
         if ($pageSize > 0) {
             $offset = ($page - 1) * $pageSize;
 
-            $list = $Db->select('gh_price.id AS id', 'gh_price.gh_price_name AS gh_price_name', 'gh_price.goods_id AS goods_id', 'gh_price.ser_id AS ser_id', 'gh_price.remarks', 'gh_price.create_time AS create_time', 'supply_price', 'brand_name', 'pj_goods.pg_series AS pg_series', 'pj_goods.version AS version', 'company_name')
+            $list = $Db->select('gh_price.id AS id', 'gh_price.gh_price_name AS gh_price_name', 'gh_price.goods_id AS goods_id', 'gh_price.ser_id AS ser_id', 'gh_price.remarks', 'gh_price.create_time AS create_time', 'supply_price', 'brand_name', 'pj_goods.pg_series AS pg_series', 'pj_goods.version AS version', 'company_name','gh_price.update_time')
                 ->orderBy('gh_price.id', 'DESC')
                 ->offset($offset)
                 ->limit($pageSize)
                 ->get();
         } else {
-            $list = $Db->select('gh_price.id AS id', 'gh_price.gh_price_name AS gh_price_name', 'gh_price.goods_id AS goods_id', 'gh_price.ser_id AS ser_id', 'gh_price.remarks', 'gh_price.create_time AS create_time', 'supply_price', 'brand_name', 'pj_goods.pg_series AS pg_series', 'pj_goods.version AS version', 'company_name')
+            $list = $Db->select('gh_price.id AS id', 'gh_price.gh_price_name AS gh_price_name', 'gh_price.goods_id AS goods_id', 'gh_price.ser_id AS ser_id', 'gh_price.remarks', 'gh_price.create_time AS create_time', 'supply_price', 'brand_name', 'pj_goods.pg_series AS pg_series', 'pj_goods.version AS version', 'company_name','gh_price.update_time')
                 ->orderBy('gh_price.id', 'DESC')
                 ->limit($pageSize)
                 ->get();
@@ -106,7 +107,7 @@ class SupplierPriceService extends Service
         //按钮-添加
         $all_button = BmmcService::wherebutton($token, $priID);
         if (($request['type'] == 2 && in_array($session['admin_groupnew'],[7,8])) || ($request['type'] == 1 && !in_array($session['admin_groupnew'],[7,8]))) {
-            $addPt = BmmcService::getTopButton('addGhprice', '', $all_button);
+            $addPt = BmmcService::getTopButton('addGhprice,uploadExcelImport', 'leadIndex', $all_button);
         } else {
             $addPt = BmmcService::getTopButton('', '', $all_button);
         }
@@ -209,4 +210,63 @@ class SupplierPriceService extends Service
 
         return false;
     }
+    /**
+     * 根据条件搜索数据内容
+     *
+     * @param array $param 条件
+     * @param array $columns 内容
+     * @param int $page 页码
+     * @param int $pageSize 页容量
+     * @return mixed
+     */
+    public static function leadIndex($param, $columns = array('*'), $page = 1, $pageSize = 20,$session='')
+    {
+        $Db = DB::table("gh_price_lead");
+        if (!empty($param['is_state'])) {//数据状态1未同步2数据异常3已同步4忽略
+            $where['is_state'] = $param['is_state'];
+        }
+        if (!empty($param['creatData'])) { //创建时间
+            $param['creatData'][1] = date("Y-m-d", strtotime($param['creatData'][1] . " +1 day"));
+            $where['create_time_between'] = $param['creatData'];
+        }
+        if (!empty($param['company_id'])) { //所属服务商
+            $where['ser_id'] = (int)$param['company_id'];
+        }
+        if (!empty($param['excel_number'])) {
+            $where['excel_number'] = $param['excel_number'];
+        }
+        if (!in_array($session['admin_groupnew'],[7,8])){
+            $where['gone_gh_price_lead.company_id'] = $session['company_id'];
+        }
+        if (in_array($session['admin_groupnew'],[8])){
+            $where['gone_gh_price_lead.company_id_searchin'] = $session['all_companys'];
+        }
+        $where = CommonService::jointWhere($where);
+        $Db = $Db->whereRaw($where);
+        $count = $Db->count();
+        $totalPage = ceil($count / $pageSize);
+        if ($pageSize > 0) {
+            $offset = ($page - 1) * $pageSize;
+
+            $list = $Db->select($columns)
+                ->orderBy('id', 'DESC')
+                ->offset($offset)
+                ->limit($pageSize)
+                ->get();
+        } else {
+            $list = $Db->select($columns)
+                ->orderBy('id', 'DESC')
+                ->limit($pageSize)
+                ->get();
+        }
+        $all_button = BmmcService::whereButton($param['token'],$param['Pri_id']);
+        $export = BmmcService::getTopButton('batchIgnoring,sysLeadData','',$all_button);
+        $button_top = $export['button_top']??[];//顶部按钮
+        $button_search = $export['button_search']??[];//搜索栏按钮
+//        if($list){
+//            $list = self::jointListData($param,$session,$list,$all_button);//获取列表信息明细说明
+//        }
+        return ['list' => $list, 'totalPage' => $totalPage, 'count' => $count, 'page' => $page, 'page_size' => $pageSize, 'button_top' => $button_top, 'button_search' => $button_search];
+
+    }
 }

routes/api.php

@@ -113,7 +113,8 @@ Route::group(['prefix' => 'service', 'middleware' => 'requestpc', 'namespace' =>
     Route::post('supplierPrice/delete', 'SupplierPriceController@destroy'); //服务供货价删除
     Route::post('supplierPrice/uploadExcelImport', 'SupplierPriceController@uploadExcelImport'); //导入供货价
     Route::post('supplierPrice/sysLeadData', 'SupplierPriceController@sysLeadData'); //同步导入价格
-
+    Route::post('supplierPrice/leadIndex', 'SupplierPriceController@leadIndex'); //导入列表
+    Route::post('supplierPrice/batchIgnoring', 'SupplierPriceController@batchIgnoring'); //批量忽略
    //du 2022-4-19
     Route::post('supplierXPrice/index', 'SupplierXPriceController@index'); //分销供货价管理
     Route::post('supplierXPrice/store', 'SupplierXPriceController@store'); //分销供货价新增