Ver código fonte

提交dpd出库验证

lvhao 21 horas atrás
pai
commit
4acbe4fc75

+ 1 - 1
core/CoreApp/controllers/Systemfout.php

@@ -635,7 +635,7 @@ class Systemfout extends Start_Controller {
 
 			// 78 dpd英国 和 79dpd欧盟
 			if(in_array($y['express'],[78,79,84])){
-				$r = $this->check->checkOverdue($y['name'],$y['number']);
+				$r = $this->check->checkOverdue($y['name'],$y['number'],$y['address']);
 				if(!$r){
 					echo json_encode(array('msg'=>'同一个客户3天内发货超过2包,不可出库!请联系店员做申报信息修改!'.$y['name']."-".$y['number']."-".$r*1,'success'=>false));exit;
 				}

+ 7 - 2
core/CoreApp/models/Model_check.php

@@ -8,9 +8,13 @@ class Model_check extends Lin_Model
 		$this->load_table('check');
 	}
 	
-	public function checkOverdue($check_name,$number){
+	public function checkOverdue($check_name,$number,$check_address){
 		$check_name = trim($check_name);
-		$info =  $this->find("check_name = '$check_name'","*",'addtime DESC');	
+		$check_address = trim($check_address);
+		if(empty($check_name) || empty($check_address)){
+			return false;
+		}
+		$info =  $this->find("(check_name = '".$check_name."') or (check_address = '".$check_address."')","*",'addtime DESC');	
 		if(empty($info)){
 
 		}else{
@@ -22,6 +26,7 @@ class Model_check extends Lin_Model
 			}
 		}
 		$this->insert([
+			'check_address' => $check_address,
 			'check_name' => $check_name,
 			'number' => $number,
 			'addtime' => time(),