Merge branch 'zhouzhendong' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/OracleActAllocationDetailService.php

@@ -40,6 +40,7 @@ Class OracleActAllocationDetailService
         if (($params['page'] ?? false) && ($params['paginate'] ?? false))$allocations = $this->paginate($params);
         else $allocations = $this->get($params);
         $count = count($allocations);
+        if (!$count)return null;
         $str = "(";
         foreach ($allocations as $index => $allocation){
             if ($index < $count-1){

app/Services/OrderService.php

@@ -194,7 +194,7 @@ class OrderService
             $ordernos = app('OracleActAllocationDetailService')
                 ->getOrderno(['checktime_start'=>$checktime_start,'checktime_end'=>$checktime_end,
                     'paginate'=>$paginate,'page'=>$page]);
-            $params['ordernos'] = $ordernos;
+            if ($ordernos)$params['ordernos'] = $ordernos;
         }
         $sql="select ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,