修改新校验规则 出库和技术的问题

core/CoreApp/controllers/Systembound.php

@@ -15,6 +15,7 @@ class Systembound extends Start_Controller {
 		$this->load->_model('Model_fullordersmt','fullordersmt');
 		$this->load->_model('Model_fullorderxw','fullorderxw');
 		$this->load->_model('Model_logic_order','logic_order');
+		$this->load->_model("Model_logic_express","logic_express");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -966,22 +967,30 @@ 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' && $sex['printcode']   != 'HUALEI-GES-EU' && $sex['printcode']   !=  'ZXDPD_UK' && $sex['printcode']   !=  'ZXDPD_EU')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符！F','success'=>false));exit;
-				}
-				if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL' && $sex['printcode']   !=  'ZXDPD_UK'  && $sex['printcode']   !=  'ZXDPD_EU')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符！D','success'=>false));exit;
-				}
-				if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01'&& $sex['printcode'] != 'YunExpress_JFPHTKR')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符！U'.$sex['printcode'],'success'=>false));exit;
-				}
-				if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB' && $sex['printcode'] != 'TTUK')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符！PE'.$sex['printcode'],'success'=>false));exit;
+				// 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' && $sex['printcode']   != 'HUALEI-GES-EU' && $sex['printcode']   !=  'ZXDPD_UK' && $sex['printcode']   !=  'ZXDPD_EU')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符！F','success'=>false));exit;
+				// }
+				// if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL' && $sex['printcode']   !=  'ZXDPD_UK'  && $sex['printcode']   !=  'ZXDPD_EU')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符！D','success'=>false));exit;
+				// }
+				// if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01'&& $sex['printcode'] != 'YunExpress_JFPHTKR')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符！U'.$sex['printcode'],'success'=>false));exit;
+				// }
+				// if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB' && $sex['printcode'] != 'TTUK')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符！PE'.$sex['printcode'],'success'=>false));exit;
+				// }
+
+				$r = $this->logic_express->ydCheckByPrintcode($number,$sex['printcode']);
+				if(!$r){
+					echo json_encode(array('msg'=>'运单号和快递类型不符-'.$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']))
 				{

core/CoreApp/controllers/Systemfout.php

@@ -46,6 +46,7 @@ class Systemfout extends Start_Controller {
 		$this->load->_model("Model_zzquque_u9","zzquque_u9");
 		$this->load->_model("Model_customsdeclaration","customsdeclaration");
 		$this->load->_model("Model_check","check");
+		$this->load->_model("Model_logic_express","logic_express");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -664,22 +665,26 @@ class Systemfout extends Start_Controller {
 			}
 			if($y['type'] != 7 && $y['waybill'] != '' && $y['printtype'] == '1')
 			{
-				$y['waybill'] = trim($y['waybill'],' ');
-			    if(strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50  && $y['express'] != 51 && $y['express'] != 63 && $y['express'] != 70 && $y['express'] != 71 &&  $y['express'] != 73  &&  $y['express'] !=  74   &&  $y['express'] !=  75 && $y['express'] != 78 && $y['express'] != 79 && $y['express'] != 83  && $y['express'] != 85)
-				{
-					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-1','success'=>false));exit;
-				}
-				else if(strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 69  && $y['express'] != 78  && $y['express'] != 79 && $y['express'] != 83   && $y['express'] != 85)
-				{
-					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-2','success'=>false));exit;
-				}
-				else if(strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67 && $y['express'] != 72 && $y['express'] != 2 && $y['express'] != 82 && $y['express'] != 83   && $y['express'] != 85)
-				{
-					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-3','success'=>false));exit;
-				}
-				else if(strlen($y['waybill']) == 16 && $y['express'] != 76 && $y['express'] != 77 && $y['express'] != 80 && $y['express'] != 83   && $y['express'] != 85)
-				{
-					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-4','success'=>false));exit;
+				// $y['waybill'] = trim($y['waybill'],' ');
+			    // if(strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50  && $y['express'] != 51 && $y['express'] != 63 && $y['express'] != 70 && $y['express'] != 71 &&  $y['express'] != 73  &&  $y['express'] !=  74   &&  $y['express'] !=  75 && $y['express'] != 78 && $y['express'] != 79 && $y['express'] != 83  && $y['express'] != 85)
+				// {
+				// 	echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-1','success'=>false));exit;
+				// }
+				// else if(strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 69  && $y['express'] != 78  && $y['express'] != 79 && $y['express'] != 83   && $y['express'] != 85)
+				// {
+				// 	echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-2','success'=>false));exit;
+				// }
+				// else if(strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67 && $y['express'] != 72 && $y['express'] != 2 && $y['express'] != 82 && $y['express'] != 83   && $y['express'] != 85)
+				// {
+				// 	echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-3','success'=>false));exit;
+				// }
+				// else if(strlen($y['waybill']) == 16 && $y['express'] != 76 && $y['express'] != 77 && $y['express'] != 80 && $y['express'] != 83   && $y['express'] != 85)
+				// {
+				// 	echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-4','success'=>false));exit;
+				// }
+				$r = $this->logic_express->ydCheckById($y['waybill'],$y['express']);
+				if(!$r){
+					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'],'success'=>false));exit;
 				}
 			}
 			if(stripos($weight,',') !== false){