修改数据 出库

core/CoreApp/controllers/Systembound.php

@@ -771,71 +771,37 @@ class Systembound extends Start_Controller {
 			}
 			else
 			{
-				$dd = $this->fullorder->find_all("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
-				if(isset($dd[0]['number']))
-				{
+				
+				$info = $this->logic_order->getInfo("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
+				$dd = [];
+				$dd[] = $info;
+				if(isset($dd[0]['number'])){
 					if($dd[0]['express'] != $express)
 					{
 						echo json_encode(array('msg'=>'录入信息和选择快递不一致！','success'=>false));exit;
 					}
-				}
-				else
-				{
-					$dd = $this->fullordersmt->find_all("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
-					if(isset($dd[0]['number']))
-				    {
-					    $number = $dd[0]['number'];
+				}else{
+					$tmp_number_arr = explode('-',$number);
+					array_pop($tmp_number_arr);
+					$number = implode("-",$tmp_number_arr);
+					$info = $this->logic_order->getInfo("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
+					$dd = [];
+					$dd[] = $info;
+					if(isset($dd[0]['number'])){
 						if($dd[0]['express'] != $express)
 						{
 							echo json_encode(array('msg'=>'录入信息和选择快递不一致！','success'=>false));exit;
 						}
-				    }
-					else
-					{
-						$dd = $this->fullordertt->find_all("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
-						if(isset($dd[0]['number']))
-				    	{
-					    	$number = $dd[0]['number'];
-							if($dd[0]['express'] != $express)
-							{
-								echo json_encode(array('msg'=>'录入信息和选择快递不一致！','success'=>false));exit;
-							}
-				    	}
-						else
-						{
-							$dd = $this->fullorderamz->find_all("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
-							if(isset($dd[0]['number']))
-				    		{
-					    		$number = $dd[0]['number'];
-								if($dd[0]['express'] != $express)
-								{
-									echo json_encode(array('msg'=>'录入信息和选择快递不一致！','success'=>false));exit;
-								}
-				    		}
-							else
-							{
-									$dd = $this->fullorderxw->find_all("number = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
-        							if(isset($dd[0]['number']))
-        				    		{
-        					    		$number = $dd[0]['number'];
-        								if($dd[0]['express'] != $express)
-        								{
-        									echo json_encode(array('msg'=>'录入信息和选择快递不一致！','success'=>false));exit;
-        								}
-        				    		}
-        							else
-        							{
-        								echo json_encode(array('msg'=>'系统中未查到此编号，请确认！','success'=>false));exit;
-        							}
-							}
-						}
+					}else{
+						echo json_encode(array('msg'=>'系统中未查到此编号，请确认！','success'=>false));exit;
 					}
+
 				}
 				$tmp_waybill = "";
 				if(isset($dd[0]['waybill'])){
 				    $tmp_waybill= $dd[0]['waybill'];
 				}
-				if(($dd[0]['printtype'] != 2) && (!in_array($dd[0]['express'],[50,51,52,69,73,75,91,93])))
+				if(($dd[0]['printtype'] != 2) && (!in_array($dd[0]['express'],[50,51,52,54,69,73,75,91,93])))
 				{
 					echo json_encode(array('msg'=>'请扫描正确的条码！','success'=>false));exit;
 				}
@@ -1147,7 +1113,7 @@ class Systembound extends Start_Controller {
 					}
 				}
 				//惠程-美国USPS  惠程-联邦  惠程-安迈世  惠程-DHL  惠程-GES(欧盟)
-				if(($dd[0]['printtype'] != 2) && (!in_array($dd[0]['express'],[50,51,52,69,73,75,91,93])))
+				if(($dd[0]['printtype'] != 2) && (!in_array($dd[0]['express'],[50,51,52,54,69,73,75,91,93])))
 				{
 					echo json_encode(array('msg'=>'请扫描正确的条码！','success'=>false));exit;
 				}