提交TT-QV切换到CBT 以及惠程联邦运单设置：打印后超过90小时超时

core/CoreApp/controllers/Apitt.php

@@ -697,9 +697,9 @@ $j = json_decode($j, true);
 								
 								}
 								//如果是走cbt的店铺那么系统将会自动将获取的快递修改为cbt的快递
-								if(in_array($post['shop'],[35,39,40,41,46,49,58])){
+								if(in_array($post['shop'],[35,39,40,41,44,46,49,58])){
 									$post['express'] = 83;
-								}else if(in_array($post['shop'],[38,44])){
+								}else if(in_array($post['shop'],[38])){
 									$post['express'] = 85;
 								}
 								//42有部分货发许昌仓 

core/CoreApp/controllers/Systemfout.php

@@ -635,6 +635,12 @@ class Systemfout extends Start_Controller {
 					echo json_encode(array('msg'=>'运单超时！请联系梦体处理！','success'=>false));exit;
 				}
 			}
+			// 50 惠程-联邦-9610  93 惠程-联邦-不报关  超过90小时不允许出库
+			if(in_array($y['express'],[50,93])){
+				if((time() - $y['printtime']) >= (90*3600)){
+					echo json_encode(array('msg'=>'该运单超时，请联系梦体处理！','success'=>false));exit;
+				}
+			} 
 
 			// 78 dpd英国 和 79dpd欧盟
 			if(in_array($y['express'],[78,79,84,92])){

template/erp/fullordertt_edit.html

@@ -783,7 +783,7 @@ $(".yzxx").click(function() {
 	 let shop = "{$fullordertt['shop']}"
 	 shop = shop*1
 	 if(source == 2){
-		if([35,39,40,41,46,49,58].includes(shop)){
+		if([35,39,40,41,44,46,49,58].includes(shop)){
 			let express = $("select[name='express']").find("option:selected").val();
 			if(express != 83){
 				layx.confirm('提示','确定CBT发货模式店铺不走cbt吗？',null,{
@@ -806,7 +806,7 @@ $(".yzxx").click(function() {
 			}else{
 				doyzxx_next()
 			}
-		}else if([38,44].includes(shop)){
+		}else if([38].includes(shop)){
 			let express = $("select[name='express']").find("option:selected").val();
 			if(express != 85 && express != 87){
 				layx.confirm('提示','确定shipping发货模式店铺不走shipping吗？',null,{