ad

app/admin/controller/After.php

@@ -2667,8 +2667,6 @@ class After extends Base
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
         $where = [['a.is_del', "=", 0], ['a.returnCode', 'in', $param['returnCode']]];
-//        if ($param['relaComNo'] !== '') $where[] = ['a.supplierNo', "=", $param['relaComNo']];
-        if ($param['returnCode'] !== '') $where[] = ['a.returnCode', "like", "%{$param['returnCode']}%"];
         if ($param['outCode'] !== '') $where[] = ['a.outCode', "like", "%{$param['outCode']}%"];
         if ($param['status'] !== '') $where[] = ['a.status', "=", $param['status']];
         if ($param['order_type'] !== "") $where[] = ['a.order_type', "=", $param['order_type']];

app/admin/controller/OrderImport.php

@@ -302,6 +302,7 @@ class OrderImport extends Base
                 ->alias('gp')
                 ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
                 ->where('gp.plat_code', $rs['plat_code'])
+                ->where('gp.exam_status', 3)//exam_status==3已上线
                 ->value('p.platform_name','');
                 
 			

app/admin/controller/Reorder.php

@@ -1648,12 +1648,12 @@ class Reorder extends Base
         if ($param['end'] !== "") $where[] = ['sr.addtime', "<=", $param['end'] . ' 23:59:59'];
         if ($param['good_code'] != "") $where[] = ['sr.good_code', "like", "%{$param['good_code']}%"]; //商品成本编码搜索
         if ($param['skuCode'] != "") $where[] = ['b.skuCode', "like", "%{$param['skuCode']}%"];//商品上线编码搜索
-        if ($param['relaComNo'] != "") $where[] = ['a.supplierNo', '=', $param['relaComNo']];
+        if ($param['relaComNo'] != "") $where[] = ['sr.companyNo', '=', $param['relaComNo']];
         if ($param['company_name'] !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($param['company_name'])];
         if ($param['order_source'] !== "") $where[] = ["b.order_source", '=', $param['order_source']];
-        if ($param['supplierNo'] != "") $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['customer_code'] != "") $where[] = ['a.customer_code', "like", '%' . $param['customer_code'] . '%'];//商品上线编码搜索
-        if ($param['companyNo'] != "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];//商品上线编码搜索
+        if ($param['supplierNo'] != "") $where[] = ['sr.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['customer_code'] != "") $where[] = ['sr.customer_code', "like", '%' . $param['customer_code'] . '%'];//商品上线编码搜索
+        if ($param['companyNo'] != "") $where[] = ['sr.companyNo', "like", '%' . $param['companyNo'] . '%'];//商品上线编码搜索
 
         $condition = [];
 

app/command/ImportOrderFromCAnalysisData.php

@@ -250,8 +250,8 @@ class ImportOrderFromCAnalysisData extends Command
             $platfrom = Db::name('good_platform')
                 ->alias('gp')
                 ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
-//                ->leftJoin('customer_org1 co', 'co.name=p.platform_name AND co.is_del=0')
                 ->where('gp.plat_code', $rs['plat_code'])
+                ->where('gp.platform_code', $rs['platform_id'])
                 ->where('gp.exam_status', 3)//exam_status==3已上线
                 ->value("platform_name",'');
 			$co = Db::connect("mysql_sys")->name('customer_org1') ->where(["name"=>$platfrom,"is_del"=>0])->find();

app/command/OutChildSend.php

@@ -24,7 +24,7 @@ class OutChildSend extends Command
         $key='outchildsend';
         $rs = Cache::store('redis')->get($key);
         if ($rs==1)return true;
-        Cache::store('redis')->set($key,1,3600);
+        Cache::store('redis')->set($key,1,3000);
         $date = date("Y-m-d H:i:s",time()-3600);
         $list = OrderOutChild::where([["addtime",">=",$date],["is_del","=",0]])->hidden(["id"])->select();
         if($list->isEmpty()==false){

app/command/caixiao.php

@@ -7,7 +7,7 @@ use app\admin\model\CgdCaixiao;
 use app\admin\model\GoodCombind;
 use app\admin\model\GoodTax;
 use app\admin\model\OrderTax;use app\admin\model\Platform;
-use app\admin\model\SaleCaixiao;
+use app\admin\model\Sale;use app\admin\model\SaleCaixiao;
 use app\model\TaxRelation;
 use think\console\Command;
 use think\console\Input;
@@ -80,7 +80,9 @@ class caixiao extends Command
            if($this->isInCfp($unique)){
             $item['inv_cat_info'] = OrderTax::spuCat($item->good_code,2);
            	$item['cat_name'] = json_decode($item->cat_name);
+           	$item['remark'] = Sale::where("orderCode",$item->cxCode==""?$item->orderCode:$item->cxCode)->value("remark","");
             $temp["data"]= json_encode($item,JSON_UNESCAPED_UNICODE);
+
             $qrd[]=$temp;
            }
     	}