提交数据

core/CoreApp/controllers/Fullorder.php

@@ -1477,7 +1477,7 @@ class Fullorder extends Start_Controller {
 				$fpdata[$k] = $xxv;
             }
 		}
-		//$fpdata = $this->logic_order->checkOrderProduct($fpdata);
+		$fpdata = $this->logic_order->checkOrderProduct($fpdata);
 		$this->data['fpdata'] = $fpdata;
 		$thfpdataxs = array();
 		if($fullorder['thfpdata'] != '')

core/CoreApp/models/Model_logic_order.php

@@ -314,11 +314,16 @@ class Model_logic_order extends Lin_Model {
         //         ];
         //     }
         // }
+        //检测快递相关信息
         $res = $this->checkOrderAndExpress($post);
         if($res['code'] == -1){
             return $res;
         }
-
+        //检测料品相关信息
+        $res = $this->cehecOrderProductByself($post['fpdata']);
+        if($res['code'] == -1){
+            return $res;
+        }
         return [
             'code'=>1,
             "msg"=>"ok"
@@ -485,10 +490,16 @@ class Model_logic_order extends Lin_Model {
                 ];
             }
         }
+        //检测快递相关信息
         $res = $this->checkOrderAndExpress($post);
         if($res['code'] == -1){
             return $res;
         }
+        //检测料品相关信息
+        $res = $this->cehecOrderProductByself($post['fpdata']);
+        if($res['code'] == -1){
+            return $res;
+        }
         return [
             'code'=>1,
             "msg"=>"ok"
@@ -647,6 +658,33 @@ class Model_logic_order extends Lin_Model {
         }
         return ['code'=>1,'msg'=>'ok'];
         
+    }
+    //订单审核编辑提交时 校验订单产品规格
+    /**
+     * $fpdata_strr 产品的fpdata
+     */
+    protected function cehecOrderProductByself($fpdata_str){
+        $fpdata = explode(';',rtrim($fpdata_str,';'));
+        foreach ($fpdata as $k=>$v) 
+        {
+            $xxv = explode('|',$v);
+            $fpdata[$k] = $xxv;
+        }
+        $list = $this->checkOrderProduct($fpdata);
+        $err_str = '';
+        $flag = 0;
+        foreach($list as $k=>$v){
+            if($v['err_sku'] == 1){
+                $flag = 1;
+                $err_str.= $v[1].'规格错误，请检查！<br/>';
+            }
+        }
+        if($flag == 1){
+            return ['code'=>-1,'msg'=>$err_str];
+        }else{
+            return ['code'=>1,'msg'=>'ok'];
+        }
+
     }
     //订单产品规格判断 
     //避免同事填错了erp的信息 然后匹配错误出库
@@ -662,7 +700,7 @@ class Model_logic_order extends Lin_Model {
             if(strpos($tmp_str,',') !== false){
                 $tmp_arr = explode(',',$tmp_str);
                 $pj_str = $tmp_arr[1].$tmp_arr[0]."-";
-                if(strpos($pj_str,'-131-')!== false){
+                if(strpos($pj_str,'-131-') === false){
                     $list[$k]['err_sku'] = $this->checkSku($size_list,$pj_str);
                 }else{
                     //131 不用判断
@@ -670,7 +708,7 @@ class Model_logic_order extends Lin_Model {
             }else{
                  $pj_str = $tmp_str;
                 //基本上就是131了 但是呢 erp奇葩多 还是加上判断吧
-                if(strpos($pj_str,'-131-')!== false){
+                if(strpos($pj_str,'-131-') === false){
                     $list[$k]['err_sku'] = $this->checkSku($size_list,$pj_str);
                 }else{
                     //131 不用判断
@@ -694,7 +732,7 @@ class Model_logic_order extends Lin_Model {
                 $flag = 1;
             }
         }
-        return $flag;
+        return $flag?0:1;
         
     }
 }