|
|
@@ -2583,7 +2583,14 @@ class MOrder extends MBaseModel
|
|
|
case 1: // 单据编号 order
|
|
|
if(strpos($keyword,StatusCode::$noPrefix[1]) !== false){
|
|
|
$orderNo = explode('-',$keyword);
|
|
|
- $orderNo = $orderNo[1].'-'.$orderNo[2];
|
|
|
+ if(count($orderNo)==3){
|
|
|
+ $orderNo = $orderNo[1].'-'.$orderNo[2];
|
|
|
+ }elseif(count($orderNo)==2){
|
|
|
+ $orderNo = $orderNo[1];
|
|
|
+ }else{
|
|
|
+ $orderNo = $keyword;
|
|
|
+ }
|
|
|
+
|
|
|
$whereSql .= ' and o.no = "'.$orderNo.'"';
|
|
|
}else{
|
|
|
$whereSql .= ' and o.no = "'.$keyword.'"';
|