lvhao před 2 týdny
rodič
revize
9b5dfcdfad

+ 1 - 0
core/CoreApp/controllers/Aatest.php

@@ -83,6 +83,7 @@ class Aatest extends Start_Controller {
     public function _remap($arg,$arg_array)
     {  
 		
+		die;
 		$number = "Y-PF-50722-001";
 	
 

+ 3 - 2
core/CoreApp/models/Model_apiyyv1.php

@@ -279,9 +279,10 @@ class Model_apiyyv1 extends Lin_Model
 
 	}
 	/**
-	 * 辅助线上测试  后期删除
+	 * 调出单的二次验证
+	 * 避免因为其他组织使用相同的erp单号导致的冲突 不能创建成品库的数据
 	 */
-	public function xcDcdByOtherIdTest($dcd_no,$token){
+	public function xcDcdByOtherIdCheck($dcd_no,$token){
 		$list["SqlString"] = "select a.DescFlexField_PubDescSeg4,a.DocNo,b.TransOutwh ,wh_out.code from InvDoc_TransferOut as a left join  InvDoc_TransOutLine as b on a.id = b.TransferOut  left join CBO_Wh wh_out on b.TransOutWh=wh_out.id  where  a.DescFlexField_PubDescSeg4 =  '".$dcd_no."' ";
 		$url = '/U9C/webapi/QueryCommon/QueryInfoBySql';
 		$url = $this->base_url.$url;

+ 20 - 1
core/CoreApp/models/Model_logic_u9xgsd.php

@@ -169,7 +169,26 @@ class Model_logic_u9xgsd extends Lin_Model {
         if(isset($ret_data[0])){
             $descflexfield_pubdescseg4 = $ret_data[0]['descflexfield_pubdescseg4'];
             if($dc_params['number'] == $descflexfield_pubdescseg4){
-                return $this->logic_tools->ret_arr(-1,"对应的调出单已存在请勿重复操作");
+                $cxdcd_r_check = $this->apiyyv1->xcDcdByOtherIdCheck($dc_params['number'],$this->getToken(130));
+                if(!isset($cxdcd_r_check[0]['Success'])){
+                    return $this->logic_tools->ret_arr(-1,"对应的调出单二次核对异常");
+                }
+                if( !$cxdcd_r_check[0]['Success']){
+                    return $this->logic_tools->ret_arr(-1,"对应的调出单二次核对报错");
+                }
+                $check_ret_data = $cxdcd_r_check[0]['Data'] ;
+                $dc_params['dcckbm'];
+                $flag = true;
+                foreach($check_ret_data as $k=>$v){
+                    if($v['code'] == $dc_params['dcckbm']){
+                        $flag = false;
+                    }
+                }
+                //目前相同组织的相同调出单 是不可能同时出现的
+                if(!$flag){
+                    return $this->logic_tools->ret_arr(-1,"对应的调出单已存在请勿重复操作");
+                }
+                
             }
         }