1

core/CoreApp/controllers/Beihuogl.php

@@ -1689,7 +1689,8 @@ class Beihuogl extends Start_Controller {
                     $err_list[] = $v['jm']."不存在";
                     continue;
                 }
-                if(empty($v['szkw'])){
+                //仓库不是特殊仓 且 设置了要校验库位
+                if(($v['erp_warehouse'] != 12) && empty($v['szkw'])){
                     $tmp_info = $this->whlabel->find("warehouse = '".$v['erp_warehouse']."' and sku = '".$v['sku']."' and details != 'DZ001'  ","*","id desc");
                     if(!empty($tmp_info)){
                         if(!empty($tmp_info['details'])){
@@ -1834,17 +1835,22 @@ class Beihuogl extends Start_Controller {
                 'real_num'=>(int)$val,
             ];
           }elseif($column == 'kw'){
-            $winfo = $this->whlabel->find("warehouse = '13' and sku = '".$info['sku']."' ","*","id desc");
-            if(!empty($winfo)){
-                $winfo = $this->whlabel->find("warehouse = '13' and sku = '".$info['sku']."' and details = '".$val."'","*","id desc");
-                if(empty($winfo)){
-                    echo json_encode(['success'=>false,'msg'=>'请仔细核查该库位信息']);exit;
+            if($info['erp_warehouse'] == '12'){
+                echo json_encode(['success'=>false,'msg'=>'特殊仓不设置库位']);exit;    
+            }else{
+                $winfo = $this->whlabel->find("warehouse = '13' and sku = '".$info['sku']."' ","*","id desc");
+                if(!empty($winfo)){
+                    $winfo = $this->whlabel->find("warehouse = '13' and sku = '".$info['sku']."' and details = '".$val."'","*","id desc");
+                    if(empty($winfo)){
+                        echo json_encode(['success'=>false,'msg'=>'请仔细核查该库位信息']);exit;
+                    }
                 }
+                
+                $update_arr = [
+                    'kw'=>trim($val),
+                ];
             }
             
-            $update_arr = [
-                'kw'=>trim($val),
-            ];
           }elseif($column == 'ck'){
             $update_arr = [
                 'erp_warehouse'=>trim($val),