ad

app/admin/controller/Report.php

@@ -714,7 +714,7 @@ class Report extends Base
 
         $data = Db::name('consult_info')
             ->alias('ci')
-            ->field('ci.infoNo zxNo,ci.good_name,ci.num,csi.companyName,ci.addtime,ci.arrival_time endtime,ci.updatetime,ci.status,co.salesman,co.saleid')
+            ->field('ci.infoNo zxNo,ci.good_name,ci.num,csi.companyName,ci.addtime,co.endtime,ci.updatetime,ci.status,co.salesman,co.saleid')
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
             ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
@@ -777,7 +777,7 @@ class Report extends Base
         $data = Db::name('consult_info')
             ->alias('ci')
             ->field('ci.infoNo 竞价订单号,ci.good_name 商品名称,
-            ci.num 需求数量,csi.companyName 客户名称,ci.addtime 创建时间,ci.arrival_time 截止时间,ci.updatetime 结束时间,
+            ci.num 需求数量,csi.companyName 客户名称,ci.addtime 创建时间,co.endtime 截止时间,ci.updatetime 结束时间,
             ci.status 状态,co.salesman 业务人员,co.saleid 部门')
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')

app/admin/controller/ReportByRelaComNo.php

@@ -828,7 +828,7 @@ class ReportByRelaComNo extends Base
 
         $data = Db::name('consult_info')
             ->alias('ci')
-            ->field('ci.infoNo zxNo,ci.good_name,ci.num,"" companyName,ci.addtime,ci.arrival_time endtime,ci.updatetime,ci.status,co.khNo')
+            ->field('ci.infoNo zxNo,ci.good_name,ci.num,"" companyName,ci.addtime,co.endtime,ci.updatetime,ci.status,co.khNo')
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
             ->where($where)
@@ -887,7 +887,7 @@ class ReportByRelaComNo extends Base
 
         $data = Db::name('consult_info')
             ->alias('ci')
-            ->field('ci.infoNo 竞价订单号,ci.good_name 商品名称,ci.num 需求数量,"" 客户名称,ci.addtime 创建时间,ci.arrival_time 截止时间,ci.updatetime 结束时间,ci.status 状态,co.khNo')
+            ->field('ci.infoNo 竞价订单号,ci.good_name 商品名称,ci.num 需求数量,"" 客户名称,ci.addtime 创建时间,co.endtime 截止时间,ci.updatetime 结束时间,ci.status 状态,co.khNo')
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
 //            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')

app/command/SplitSale.php

@@ -61,26 +61,24 @@ class SplitSale extends Command
                 foreach ($data as $sale) {
 
                     //补充商品信息
-                    if ($sale['order_type'] == 3) {
+                    if ($sale['order_type'] == 3 ||$sale['order_type'] == 4) {
                         //咨询相关
-                        $good = Db::name('consult_bids')
-                            ->field('b.noble_metal,c.brand_name brand,d.unit,a.cost_desc,a.good_weight noble_weight,b.tax,a.delivery_day,0 lead_time')
-                            ->alias('a')
-                            ->rightJoin('good_zixun b', 'b.is_del=0 AND b.spuCode=a.spuCode')
-                            ->leftJoin('brand c', 'c.id=a.brand_id')
-                            ->leftJoin('unit d', 'd.id=a.unit_id')
-                            ->where(['a.is_del' => 0, 'a.spuCode' => $sale['good_code']])
-                            ->findOrEmpty();
-                    } elseif ($sale['order_type'] == 4) {
-                        //报备单
-                        $good = Db::name('filing')
-                            ->field('a.noble_metal,c.brand_name brand,d.unit,a.cost_desc,a.gold_weight noble_weight,b.tax,a.delivery_day,0 lead_time')
-                            ->alias('a')
-                            ->rightJoin('good_zixun b', 'b.is_del=0 AND b.spuCode=a.spuCode')
-                            ->leftJoin('brand c', 'c.id=a.brand_id')
-                            ->leftJoin('unit d', 'd.id=a.unit_id')
-                            ->where(['a.is_del' => 0, 'a.orderCode' => $sale['good_code']])
+                        $good = Db::name('good_zixun')->alias("b")
+                            ->field('b.noble_metal,c.brand_name brand,d.unit,b.craft_desc cost_desc,b.good_weight noble_weight,b.tax,0 delivery_day,0 lead_time')
+                            ->leftJoin('brand c', 'c.id=b.brand_id')
+                            ->leftJoin('unit d', 'd.id=b.good_unit')
+                            ->where(['b.spuCode' => $sale['good_code']])
                             ->findOrEmpty();
+//                    } elseif ($sale['order_type'] == 4) {
+//                        //报备单
+//                        $good = Db::name('filing')
+//                            ->field('a.noble_metal,c.brand_name brand,d.unit,a.cost_desc,a.gold_weight noble_weight,b.tax,a.delivery_day,0 lead_time')
+//                            ->alias('a')
+//                            ->rightJoin('good_zixun b', 'b.is_del=0 AND b.spuCode=a.spuCode')
+//                            ->leftJoin('brand c', 'c.id=a.brand_id')
+//                            ->leftJoin('unit d', 'd.id=a.unit_id')
+//                            ->where(['a.is_del' => 0, 'b.spuCode' => $sale['good_code']])
+//                            ->findOrEmpty();
                     } else {
                         $good = Db::name('good')
                             ->field('b.noble_metal,c.brand_name brand,d.unit,b.craft_desc cost_desc,b.noble_weight,b.tax,b.delivery_day,b.lead_time')