平台订单导入，列表优化(同一个平台商品编号在多个平台上线的情况)

app/admin/controller/OrderImport.php

@@ -105,7 +105,7 @@ class OrderImport extends Base
 
         $list = OIFCModel::alias('c')
             ->field('c.*,g.good_name,p.platform_name platform_title')
-            ->leftJoin('good_platform gp', 'gp.plat_code=c.plat_code AND gp.is_del=0')
+            ->leftJoin('good_platform gp', 'gp.plat_code=c.plat_code AND gp.platform_code=c.platform_id AND gp.is_del=0')
             ->leftJoin('good g', 'g.spuCode=gp.spuCode AND g.is_del=0')
             ->leftJoin('platform p', 'p.id=c.platform_id AND p.is_del=0')
             ->where($where)

app/admin/controller/Report.php

@@ -1323,58 +1323,61 @@ class Report extends Base
     //【九、出入库明细报表】_列表
     public function GoodLogList()
     {
-//        $param = $this->request->only([
-//            'token',
-//            'creater' => '',
-//            'supplier_name' => '',
-//            'start_date' => '',
-//            'end_date' => '',
-//            'page' => 1,
-//            'size' => 15
-//        ], 'post', 'trim');
+        /**
+         * $param = $this->request->only([
+         * 'token',
+         * 'creater' => '',
+         * 'supplier_name' => '',
+         * 'start_date' => '',
+         * 'end_date' => '',
+         * 'page' => 1,
+         * 'size' => 15
+         * ], 'post', 'trim');
+         * **/
     }
 
     //【九、出入库明细报表】_导出
     public function GoodLogExport()
     {
-//        $param = $this->request->only([
-//            'token',
-////            'creater' => '',
-////            'supplier_name' => '',
-////            'start_date' => '',
-////            'end_date' => ''
-//        ], 'post', 'trim');
-//
-//        $val_params = Validate::rule([
-//            'start_date' => 'date|elt:end_date',
-//            'end_date' => 'date'
-//        ]);
-//
-//        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
-//
-////        $where = [['gl.action_type', '=', 'CGD']];
-////        if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.updatetime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
-////        if ($param['creater'] != '') $where[] = ['gb.creater', 'like', '%' . $param['creater'] . '%'];
-////        if ($param['supplier_name'] != '') $where[] = ['s.name', 'like', '%' . $param['supplier_name'] . '%'];
-//
-//
-//        $list = Db::name('good_log')
-//            ->alias('gl')
-//            ->field('"" 创建人,"" 创建人公司,"" 创建人部门,"" 创建时间,"" 单据状态,"" 采购单号,gl.type 出入库类型,gb.good_name 商品名称,gb.spuCode 产品编码,gl.stock 出入库数量,gl.addtime 出入库日期,"" 维护人员,"" 发起人,wi.wsm_type 库房性质,s.name 库房公司,wi.name 库房名称')
-////            ->where($where)
-//            ->leftJoin('good_stock gs', 'gs.id=gl.stock_id AND gs.is_del=0')
-//            ->leftJoin('good_basic gb', 'gb.spuCode=gs.spuCode AND gb.is_del=0')
-//            ->leftJoin('warehouse_info wi', 'wi.wsm_code=gs.wsm_code AND wi.is_del=0')
-//            ->leftJoin('supplier s', 's.code=wi.supplierNo AND s.is_del=0')
-////            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
-//            ->select()
-//            ->toArray();
-//        halt($list);
-//        if (empty($list)) $list[] = '没有可供导出的数据';
-//
-//        $headerArr = array_keys($list[0]);
-//        excelSave('出入库明细报表' . date('YmdHis'), $headerArr, $list);
-
+        /**
+         * $param = $this->request->only([
+         * 'token',
+         * //            'creater' => '',
+         * //            'supplier_name' => '',
+         * //            'start_date' => '',
+         * //            'end_date' => ''
+         * ], 'post', 'trim');
+         *
+         * $val_params = Validate::rule([
+         * 'start_date' => 'date|elt:end_date',
+         * 'end_date' => 'date'
+         * ]);
+         *
+         * if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+         *
+         * //        $where = [['gl.action_type', '=', 'CGD']];
+         * //        if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.updatetime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
+         * //        if ($param['creater'] != '') $where[] = ['gb.creater', 'like', '%' . $param['creater'] . '%'];
+         * //        if ($param['supplier_name'] != '') $where[] = ['s.name', 'like', '%' . $param['supplier_name'] . '%'];
+         *
+         *
+         * $list = Db::name('good_log')
+         * ->alias('gl')
+         * ->field('"" 创建人,"" 创建人公司,"" 创建人部门,"" 创建时间,"" 单据状态,"" 采购单号,gl.type 出入库类型,gb.good_name 商品名称,gb.spuCode 产品编码,gl.stock 出入库数量,gl.addtime 出入库日期,"" 维护人员,"" 发起人,wi.wsm_type 库房性质,s.name 库房公司,wi.name 库房名称')
+         * //            ->where($where)
+         * ->leftJoin('good_stock gs', 'gs.id=gl.stock_id AND gs.is_del=0')
+         * ->leftJoin('good_basic gb', 'gb.spuCode=gs.spuCode AND gb.is_del=0')
+         * ->leftJoin('warehouse_info wi', 'wi.wsm_code=gs.wsm_code AND wi.is_del=0')
+         * ->leftJoin('supplier s', 's.code=wi.supplierNo AND s.is_del=0')
+         * //            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+         * ->select()
+         * ->toArray();
+         * halt($list);
+         * if (empty($list)) $list[] = '没有可供导出的数据';
+         *
+         * $headerArr = array_keys($list[0]);
+         * excelSave('出入库明细报表' . date('YmdHis'), $headerArr, $list);
+         **/
     }
 
     //【十、退货台账-业务口径】
@@ -1428,4 +1431,9 @@ class Report extends Base
         excelSave('退货台账-业务口径' . date('YmdHis'), $headerArr, $list);
     }
 
+    //库存预警汇总
+    public function StockExport(){
+
+    }
+
 }