处理周六下午修改的东西

core/CoreApp/controllers/Aatest.php

@@ -112,10 +112,15 @@ class Aatest extends Start_Controller {
 		$list = $this->fullorder->find_all('state = 207 and express = 76 and  library = 2 and librarytime < 1749484816','id,state,express,number');
 		// echo "<pre>";
 		// print_r($list);
+		echo "<pre>";
 		print_r(count($list));
-		var_dump($list[0]['id']);
-		die;
-		$this->fullorder->save(['state'=>216],$list[0]['id']);
+		var_dump($list[0]['number']);
+		if(!empty($list)){
+		    	$this->fullorder->save(['state'=>216],$list[0]['id']);
+		}
+// 		var_dump($list[0]['id']);
+// 		die;
+	
 		
 
 	}

core/CoreApp/models/Model_cne.php

@@ -114,7 +114,12 @@ function __construct(){
 		
 		if(!isset($res['returnDatas'][0]['corpBillid']))
 		{
-			$g = array('x'=>'0','Description'=>$res['returnDatas'][0]['message'],'cs'=>$count);
+		    if(empty($res['returnDatas'][0]['message'])){
+		        $g = array('x'=>'0','Description'=>"云尚服务器异常!!!",'cs'=>$count);
+		    }else{
+		        $g = array('x'=>'0','Description'=>$res['returnDatas'][0]['message'],'cs'=>$count);
+		    }
+			
 		}
 		else if(isset($res['returnDatas'][0]['statusCode']) && $res['returnDatas'][0]['statusCode'] == 'error'){
 			$g = array('x'=>'0','Description'=>json_encode($res,JSON_UNESCAPED_UNICODE));

template/erp/js/goodsrules.js

@@ -61,17 +61,23 @@ function checkBendang(that) {
  * 当颜色选择是#613时，不可将等级勾选为9A
  * grade_value 选中类目的值      9A代表80  10A代表81
  * color_value 真人发类型选中值  44代表#613
+ * category_value   类目         
  */ 
 function checkColorGrade(that) {
     let grade_value = $("select[name='grade']").val();
     let color_value = $("select[name='color']").val();
+    let category_value = $("select[name='category']").val();
+    let arr = [1297,1702];
     
-    if (grade_value == 80 && color_value == 44) {
-        that.val("")
-        layx.alert('错误', '当颜色选择是#613时，不可将等级勾选为9A', function(id, button) {
-           let ysdj =  $("select[name='color']").find("option:selected").data('ysdj')
-           $("select[name='grade']").val(ysdj)
-        }, { dialogIcon: 'error' });
+    if(!arr.includes(category_value*1)){
+        if (grade_value == 80 && color_value == 44) {
+            that.val("")
+            layx.alert('错误', '当颜色选择是#613时，不可将等级勾选为9A', function(id, button) {
+               let ysdj =  $("select[name='color']").find("option:selected").data('ysdj')
+               $("select[name='grade']").val(ysdj)
+            }, { dialogIcon: 'error' });
+        }
     }
+    
 }