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

app/admin/controller/Purchin.php

@@ -681,12 +681,13 @@ class Purchin extends Base
                     $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => $stockid, "type" => 2, 'stock' => $send_num, "stock_name" => "wait_in_stock"];
                     if ($upd) {
                         GoodLog::LogAdd(['id' => $uid, 'nickname' => $nickname], $good_data, 'RKD');
+                        $bnin = GoodStockInfo::AddBn($stockid, $bn_code, $send_num, $cgdinfo[$cgdNo]['good_price']);
+                        if ($bnin == false) {
+                            Db::rollback();
+                            return error_show(1004, "库存bn数据新增失败");
+                        }
                         if ($cgdinfo[$cgdNo]['order_type'] == 1) {
-                            $bnin = GoodStockInfo::AddBn($stockid, $bn_code, $send_num, $cgdinfo[$cgdNo]['good_price']);
-                            if ($bnin == false) {
-                                Db::rollback();
-                                return error_show(1004, "库存bn数据新增失败");
-                            }
+
                             $bk = Db::name("order_bk")->where(['cgdNo' => $cgdNo])->find();
                             if ($bk == false) {
                                 $bk = [

app/admin/route/app.php

@@ -649,6 +649,48 @@ Route::rule('pome', 'admin/SaleReport/purcheaseOrderMonthExport');//十三、供
 Route::rule('popm', 'admin/SaleReport/purcheaseOrderPersonMonth');//十四、供应商负责人采购订单情况
 Route::rule('popme', 'admin/SaleReport/purcheaseOrderPersonMonthExport');//十四、供应商负责人采购订单情况-导出
 
+//前端报表--业务公司筛选
+Route::rule('r_saleexportconsultday', 'admin/SaleReportByRelaComNo/consultDay');//管理报表-日报
+Route::rule('r_saleexportconsultdayexport', 'admin/SaleReportByRelaComNo/consultDayExport');//管理报表-日报-导出
+Route::rule('r_saleexportconsultinfo', 'admin/SaleReportByRelaComNo/consultInfo');//管理报表-竞价反馈报表
+Route::rule('r_saleexportconsultinfoexport', 'admin/SaleReportByRelaComNo/consultInfoExport');//管理报表-竞价反馈报表-导出
+Route::rule('r_srcin', 'admin/SaleReportByRelaComNo/consultInfoNew');//管理报表-竞价单报表
+Route::rule('r_srcine', 'admin/SaleReportByRelaComNo/consultInfoNewExport');//管理报表-竞价单报表-导出
+Route::rule('r_saleexportlist', 'admin/SaleReportByRelaComNo/saleList');//管理报表-订单报表
+Route::rule('r_saleexport', 'admin/SaleReportByRelaComNo/saleExport');//管理报表-订单报表-导出
+Route::rule('r_saleexportnotout', 'admin/SaleReportByRelaComNo/saleNotOut');//管理报表-未发货报表
+Route::rule('r_saleexportnotoutexport', 'admin/SaleReportByRelaComNo/saleNotOutExport');//管理报表-未发货报表-导出
+Route::rule('r_saleexportnotsigned', 'admin/SaleReportByRelaComNo/saleNotSigned');//管理报表-未签收报表-导出
+Route::rule('r_saleexportnotsignedexport', 'admin/SaleReportByRelaComNo/saleNotSignedExport');//管理报表-未签收报表-导出
+Route::rule('r_saleexportorderreturn', 'admin/SaleReportByRelaComNo/orderReturn');//管理报表-售后报表
+Route::rule('r_saleexportorderreturnexport', 'admin/SaleReportByRelaComNo/orderReturnExport');//管理报表-售后报表-导出
+Route::rule('r_saleexportgoodrankinglist', 'admin/SaleReportByRelaComNo/goodRankingList');//管理报表-产品热销排行
+Route::rule('r_saleexportgoodrankinglistexport', 'admin/SaleReportByRelaComNo/goodRankingListExport');//管理报表-产品热销排行-导出
+Route::rule('r_saleexportconsultdetailed', 'admin/SaleReportByRelaComNo/consultDetailed');//咨询单导出明细
+Route::rule('r_saleexportconsultdetailedexport', 'admin/SaleReportByRelaComNo/consultDetailedExport');//咨询单导出明细-导出
+Route::rule('r_saleexportsalediff', 'admin/SaleReportByRelaComNo/saleDiff');//工差明细表-导出
+Route::rule('r_saleexportsalediffexport', 'admin/SaleReportByRelaComNo/saleDiffExport');//工差明细表-导出
+Route::rule('r_saleexportthdata', 'admin/SaleReportByRelaComNo/thData');//退货明细表
+Route::rule('r_saleexportthdataexport', 'admin/SaleReportByRelaComNo/thDataExport');//退货明细表-导出
+Route::rule('r_seord', 'admin/SaleReportByRelaComNo/orderReturnDetailed');//售后明细表
+Route::rule('r_seorde', 'admin/SaleReportByRelaComNo/orderReturnDetailedExport');//售后明细表-导出
+Route::rule('r_sebo', 'admin/SaleReportByRelaComNo/bargainOrder');//议价明细表
+Route::rule('r_seboe', 'admin/SaleReportByRelaComNo/bargainOrderExport');//议价明细表
+Route::rule('r_seoona', 'admin/SaleReportByRelaComNo/orderOutNotAddr');//延时发货申请单统计
+Route::rule('r_seoonae', 'admin/SaleReportByRelaComNo/orderOutNotAddrExport');//延时发货申请单统计 -导出
+Route::rule('r_seooa', 'admin/SaleReportByRelaComNo/orderOutAddr');//直接发货申请单统计
+Route::rule('r_seooae', 'admin/SaleReportByRelaComNo/orderOutAddrExport');//直接发货申请单统计 -导出
+Route::rule('r_sna', 'admin/SaleReportByRelaComNo/saleNotAddr');//无地址销售订单统计
+Route::rule('r_snae', 'admin/SaleReportByRelaComNo/saleNotAddrExport');//无地址销售订单统计
+Route::rule('r_sm', 'admin/SaleReportByRelaComNo/saleMonth');//十一、销售订单商品类型
+Route::rule('r_sme', 'admin/SaleReportByRelaComNo/saleMonthExport');//十一、销售订单商品类型-导出
+Route::rule('r_oom', 'admin/SaleReportByRelaComNo/orderOutMonth');//十二、采购订单发货维度表
+Route::rule('r_oome', 'admin/SaleReportByRelaComNo/orderOutMonthExport');//十二、采购订单发货维度表-导出
+Route::rule('r_pom', 'admin/SaleReportByRelaComNo/purcheaseOrderMonth');//十三、供应商采购订单情况
+Route::rule('r_pome', 'admin/SaleReportByRelaComNo/purcheaseOrderMonthExport');//十三、供应商采购订单情况-导出
+Route::rule('r_popm', 'admin/SaleReportByRelaComNo/purcheaseOrderPersonMonth');//十四、供应商负责人采购订单情况
+Route::rule('r_popme', 'admin/SaleReportByRelaComNo/purcheaseOrderPersonMonthExport');//十四、供应商负责人采购订单情况-导出
+
 Route::rule("catplatadd", "admin/CatPlat/add");
 Route::rule("catplatedit", "admin/CatPlat/edit");
 Route::rule("catplatlist", "admin/CatPlat/list");