|
@@ -899,18 +899,25 @@ class Systembound extends Start_Controller {
|
|
|
}
|
|
|
}
|
|
|
**/
|
|
|
+
|
|
|
+
|
|
|
if(strlen($number) == 12 && $sex['printcode'] != 'FEDEX' && $sex['printcode'] != 'FEDEXGF' && $sex['printcode'] != 'HUALEI-MLXY' && $sex['printcode'] != 'FEDEX_G' && $sex['printcode'] != 'HUALEIXW-USPS' && $sex['printcode'] != 'FedEx_GD' )
|
|
|
{
|
|
|
echo json_encode(array('msg'=>'运单号和快递类型不符!F','success'=>false));exit;
|
|
|
}
|
|
|
- if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA')
|
|
|
+ if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL')
|
|
|
{
|
|
|
echo json_encode(array('msg'=>'运单号和快递类型不符!D','success'=>false));exit;
|
|
|
}
|
|
|
- if(strlen($number) == 18 && $sex['printcode'] != 'UPS')
|
|
|
+ if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01')
|
|
|
{
|
|
|
- echo json_encode(array('msg'=>'运单号和快递类型不符!U','success'=>false));exit;
|
|
|
+ echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
|
|
|
}
|
|
|
+ if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB')
|
|
|
+ {
|
|
|
+ echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
$tmp_waybill = $number;
|
|
|
$yd = $this->fullorder->find_all("waybill = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
|
|
@@ -1227,6 +1234,10 @@ class Systembound extends Start_Controller {
|
|
|
{
|
|
|
echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
|
|
|
}
|
|
|
+ if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB')
|
|
|
+ {
|
|
|
+ echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
|
|
|
+ }
|
|
|
$yd = $this->fullorder->find_all("waybill = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
|
|
|
if(isset($yd[0]['number']))
|
|
|
{
|