提交数据

core/CoreApp/controllers/Queueu9.php

@@ -70,6 +70,7 @@ class Queueu9 extends Start_Controller {
 
      //执行小单的流转到临时仓的队列  
     public function _xdls(){
+        die;
         echo "<pre>";
         //第一步生成 许昌成品库的调出单
         //$list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 0 and cg_status = 0 and xs_status = 0 and order_no = 'ALIP-50228-022'");
@@ -82,33 +83,37 @@ class Queueu9 extends Start_Controller {
         }
         
         $this->logic_u9xg->xdlsOneStep($do_list);
-        //sleep(3);
+        sleep(3);
         //第二步 提交审核第一步的采购单和销售单
-        // $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 1 and cg_status = 1 and xs_status = 1  and order_no = 'KISS-50123-003'");
+        $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 1 and cg_status = 1 and xs_status = 1  ");
       
-        // $this->logic_u9xg->xdlsTwoStep($list);
+        $this->logic_u9xg->xdlsTwoStep($list);
         //第三步  查询调出单生成的调入单是否生成 如果生成了就审核 如果没生成 说明异常了 这种都是按步骤走的
-        // $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 1 and cg_status = 3 and xs_status = 3 and dr_status = 0 and order_no = 'KISS-50123-003'");
-        // $this->logic_u9xg->xdlsThreeStep($list);
+        $list =  $this->zzquque_u9->find_all("type = 10  and dc_status = 3 and cg_status = 3 and xs_status = 3 and  dr_status = 0");
+        $this->logic_u9xg->xdlsThreeStep($list);
         //第四步  建立香港的销售单 标准出库单有源的需要先审核 先创建销售单
-        // $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 0 and order_no = 'KISS-50123-003'");
-        // $do_list = [];
-        // foreach($list as $k=>$v){
-        //     $tmp_info = $this->logic_order->getInfoByType($v['platform'],$v['order_no']);
-        //     $tmp_info['zq_u9_id'] = $v['id'];
-        //     $do_list[] = $tmp_info;
-        // }
-        // $this->logic_u9xg->xdlsFourStep($do_list);
+        $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 0 ");
+        $do_list = [];
+        foreach($list as $k=>$v){
+            $tmp_info = $this->logic_order->getInfoByPlat($v['platform'],$v['order_no']);
+            $tmp_info['zq_u9_id'] = $v['id'];
+            $tmp_info['dc_no'] = $v['dc_no'];
+            $do_list[] = $tmp_info;
+        }
+        $this->logic_u9xg->xdlsFourStep($do_list);
 
 
          //执行第五步骤 审核销售单 并同时生成标准出货单
-        //  $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 1 and bzch_status = 0 and order_no = 'KISS-50123-003'");
-
-        //  $this->logic_u9xg->xdlsFivestep($list);
-        //  sleep(3);
-        //  $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 3 and bzch_status = 1 and order_no = 'KISS-50123-003'");
+        $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 1 and bzch_status = 0 ");
+    
+        if(!empty($list)){
+            $this->logic_u9xg->xdlsFiveStep($list);
+        }
+        
+         sleep(3);
+         $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 3 and xs_status = 3 and dr_status = 3 and xs_two_status = 3 and bzch_status = 1 ");
  
-        //  $this->logic_u9xg->xdlsSixStep($list);
+         $this->logic_u9xg->xdlsSixStep($list);
     }
    
     

core/CoreApp/controllers/Zzququeu9.php

@@ -10,40 +10,40 @@ class Zzququeu9 extends Start_Controller {
     public function _remap($arg,$arg_array)
     {
 		if($arg == 'dc')//调出单
-        {
-             $this->_dc($arg_array);
-        }
-        elseif($arg == 'cg')//采购
-        {
-             $this->_cg($arg_array);
-        }
-        elseif($arg == 'xs')//销售单
-        {
-             $this->_xs($arg_array);
-        }
-        elseif($arg == 'bzch')//标准出货
-        {
-             $this->_bzch($arg_array);
-        }
-        elseif($arg == 'bzsh')//标准收货
-        {
-             $this->_bzsh($arg_array);
-        }
-        elseif($arg == 'dr')//调入单
-        {
-             $this->_dr($arg_array);
-        }
-        elseif($arg == 'xs_two')//调入单
-        {
-             $this->_xs_two($arg_array);
-        }
-        elseif($arg == 'add'){
-            $this->_add($arg_array);
-        }
-		else
-		{
-			 $this->_index();
-		}
+          {
+               $this->_dc($arg_array);
+          }
+          elseif($arg == 'cg')//采购
+          {
+               $this->_cg($arg_array);
+          }
+          elseif($arg == 'xs')//销售单
+          {
+               $this->_xs($arg_array);
+          }
+          elseif($arg == 'bzch')//标准出货
+          {
+               $this->_bzch($arg_array);
+          }
+          elseif($arg == 'bzsh')//标准收货
+          {
+               $this->_bzsh($arg_array);
+          }
+          elseif($arg == 'dr')//调入单
+          {
+               $this->_dr($arg_array);
+          }
+          elseif($arg == 'xs_two')//调入单
+          {
+               $this->_xs_two($arg_array);
+          }
+          elseif($arg == 'add'){
+               $this->_add($arg_array);
+          }
+          else
+          {
+               $this->_index();
+          }
 	}
     public function _index(){
 
@@ -220,7 +220,6 @@ class Zzququeu9 extends Start_Controller {
 
     }
     public function  _add($arg_array){
-        die;
         $order_no = $arg_array[0];
         if(empty($order_no)){
             exit("订单编码不存在");

core/CoreApp/models/Model_apiyyv1.php

@@ -105,7 +105,8 @@ class Model_apiyyv1 extends Lin_Model
 	 * 根据调出单的单号做关联查询 然后匹配存储调入单的审核
 	 */
 	public function drdcxBydcd($dcd_no,$token){
-		$list["SqlString"] = "select DescFlexField_PubDescSeg4 ,DocNo from InvDoc_TransferIn  where  DescFlexField_PubDescSeg4  =  '".$dcd_no."'";
+		// $list["SqlString"] = "select DescFlexField_PubDescSeg4 ,DocNo from InvDoc_TransferIn  where  DescFlexField_PubDescSeg4  =  '".$dcd_no."'";
+		$list["SqlString"] = "select a.docno,b.srcdocinfo_srcdocno from InvDoc_TransferIn as a left join InvDoc_TransInLine as b on a.id=b.TransferIn where srcdocinfo_srcdocno='".$dcd_no."'";
 		$url = '/U9C/webapi/QueryCommon/QueryInfoBySql';
 		$url = $this->base_url.$url;
 		$header[] = "Content-Type: application/json";
@@ -415,7 +416,7 @@ class Model_apiyyv1 extends Lin_Model
 					]
 				],
 				'RecTerm'=>'',//目前找不到了
-				'FreeType'=>-1,//免费品类型 (无默认值请传-1;赠品请传0；备损品请传1)   徐凯设定的是  如果钱小于0.01  那么就传0 其他的传递-1
+				'FreeType'=>($v['final_price'] < 0.01)?0: -1,//免费品类型 (无默认值请传-1;赠品请传0；备损品请传1)   徐凯设定的是  如果钱小于0.01  那么就传0 其他的传递-1
 				'UsableQtyOfInv'=>0,//文档中未查询到
 				'PubDescSeg3'=>'',
 				'PubDescSeg4'=>'',

core/CoreApp/models/Model_logic_u9xg.php

@@ -7,7 +7,7 @@ class Model_logic_u9xg extends Lin_Model {
     public $xdcp_code = '13001';//许昌成品库的编码  测试的时候就用龙盈工厂的仓库
     public $xdxgzzcode = '140';//香港组织公司编码
     public $xdxgls_code = '14003';//香港临时库的编码   测试的时候用销售公司成品库的编码
-    public $ztcode = '001';//账套的code;
+    public $ztcode = '9966';//账套的code;
     public $tb_org_arr =[101,110,130,140];//同步组织
     public $gys = "98002";//供应商  98001  龙盈  98002  龙熠
     //切记要修改token_120的token真正的token！！！！
@@ -70,22 +70,16 @@ class Model_logic_u9xg extends Lin_Model {
     //查询调出单生成的调入单是否生成 如果生成了就审核 如果没生成 说明异常了 这种都是按步骤走的
     public function xdlsThreeStep($list){
         foreach($list as $k=>$v){
-            $r = $this->apiyyv1->drdcxBydcd($v['order_no'],$this->getToken(140));
+            $r = $this->apiyyv1->drdcxBydcd($v['dc_no'],$this->getToken(140));
+        
             //如果获取对应调入单没有成功 
             if(empty($r[0]['Data'][0]['docno'])){
                 $this->editData($v['id'],['dr_status'=>-1,'update_time'=>time()],$v['order_no'],6,1,'dr',$r[1],$r[0]);
                 continue;
             }
-            if(count($r[0]['Data'])>1){
-                foreach($r[0]['Data'] as $item){
-                    if($item['descflexfield_pubdescseg4'] == $v['order_no']){
-                        $dr_no = $item['docno'];
-                    }
-                }
-            }else{
-                $dr_no = $r[0]['Data'][0]['docno'];
-            }
-            $this->editData($v['id'],['dr_no'=>$r[0]['Data'][0]['docno'],'dr_status'=>1,'update_time'=>time()],$v['order_no'],6,1,'dr',$r[1],$r[0]);
+            $dr_no = $r[0]['Data'][0]["docno"];
+           
+            $this->editData($v['id'],['dr_no'=>$dr_no,'dr_status'=>1,'update_time'=>time()],$v['order_no'],6,1,'dr',$r[1],$r[0]);
             
             //提交调入单 
             $rr = $this->apiyyv1->drdSubmit(['number'=>$dr_no],$this->getToken(140));
@@ -135,38 +129,48 @@ class Model_logic_u9xg extends Lin_Model {
                         'zq_u9_id'=>$item['id'],
                         'drckbm'=>$this->xdxgls_code,
                         'number'=>$item['order_no'],
+                        'order_no'=>$item['order_no'],
                         'xs_no'=>$k,
-                        'xs_no_two'=>$k,
+                        'xs_two_no'=>$k,
                         'list'=>$v
                     ];
                 }
             }
         }
         foreach($final_list as $info){
-            $bzch_res = $this->apiyyv1->bzchCreate($info,$this->getToken(140));
-            if(empty($bzch_res[0]['Data'][0]['m_code'])){
-                $this->editData($info['zq_u9_id'],['bzch_status'=>-1,'update_time'=>time()],$info['number'],4,1,'bzch',$bzch_res[1],$bzch_res[0]);
-                return ;
-            }
-           
-            //更新销售单数据
-            $bzch_no = $bzch_res[0]['Data'][0]["m_code"];
-            $this->editData($info['zq_u9_id'],['bzch_no'=>$bzch_no,'bzch_status'=>1,'update_time'=>time()],$info['number'],4,1,'bzch',$bzch_res[1],$bzch_res[0]);
+            $this->xdlsFiveStepAfter($info);
         }
        
         
     }
+
+    public function xdlsFiveStepAfter($info){
+        //先审核 然后在执行
+        $r = $this->xsSubAndCheck140($info);
+        if(!$r){
+            return ;
+        }
+        $bzch_res = $this->apiyyv1->bzchCreate($info,$this->getToken(140));
+        if(empty($bzch_res[0]['Data'][0]['m_code'])){
+            $this->editData($info['zq_u9_id'],['bzch_status'=>-1,'update_time'=>time()],$info['number'],4,1,'bzch',$bzch_res[1],$bzch_res[0]);
+            return ;
+        }
+
+        //更新销售单数据
+        $bzch_no = $bzch_res[0]['Data'][0]["m_code"];
+        $this->editData($info['zq_u9_id'],['bzch_no'=>$bzch_no,'bzch_status'=>1,'update_time'=>time()],$info['number'],4,1,'bzch',$bzch_res[1],$bzch_res[0]);
+    }
     //审核香港标准出库单
     public function xdlsSixStep($list){
         foreach($list as $k =>$v){
             $bzch_res = $this->apiyyv1->bzchSubmitAndApprove(['number'=>$v['bzch_no']],$this->getToken(140));
             if(empty($bzch_res[0]['Data'][0]['m_code'])){
-                $this->editData($v['id'],['bzch_status'=>-1,'update_time'=>time()],$v['order_no'],4,3,'bzch',$bzch_res[1],$bzch_res[0]);
+                $this->editData($v['id'],['bzch_status'=>-3,'update_time'=>time()],$v['order_no'],4,3,'bzch',$bzch_res[1],$bzch_res[0]);
                 return ;
            }
            //更新销售单数据
            $bzch_no = $bzch_res[0]['Data'][0]["m_code"];
-           $this->editData($v['id'],['bzch_no'=>$bzch_no,'bzch_status'=>1,'update_time'=>time()],$v['order_no'],4,3,'bzch',$bzch_res[1],$bzch_res[0]);
+           $this->editData($v['id'],['bzch_no'=>$bzch_no,'bzch_status'=>3,'update_time'=>time()],$v['order_no'],4,3,'bzch',$bzch_res[1],$bzch_res[0]);
         }
 
     }
@@ -352,6 +356,27 @@ class Model_logic_u9xg extends Lin_Model {
         return true;
     }
 
+    public function xsSubAndCheck140($info){
+        $r = $this->apiyyv1->xsdSubmit([
+            'number'=>$info['xs_two_no']
+        ],$this->getToken(140));
+    
+        if(!$r[0]['Data'][0]['m_isSucess']){
+            $this->editData($info['zq_u9_id'],['xs_two_status'=>-2,'update_time'=>time()],$info['order_no'],2,2,'xs',$r[1],$r[0]);
+            return false;
+        }
+        $this->editData($info['zq_u9_id'],['xs_two_status'=>2,'update_time'=>time()],$info['order_no'],2,2,'xs',$r[1],$r[0]);
+        $rr = $this->apiyyv1->xsdApprove([
+            'number'=>$info['xs_two_no']
+        ],$this->getToken(140));
+        if(!$rr[0]['Data'][0]['m_isSucess']){
+            $this->editData($info['zq_u9_id'],['xs_two_status'=>-3,'update_time'=>time()],$info['order_no'],2,3,'xs',$rr[1],$rr[0]);
+            return false;
+        }   
+        $this->editData($info['zq_u9_id'],['xs_two_status'=>3,'update_time'=>time()],$info['order_no'],2,3,'xs',$rr[1],$rr[0]);
+        return true;
+    }
+
     //建立销售单 和出货单
     public function xdlsAfterDetail($info,$typeclass,$classid){
        
@@ -394,7 +419,7 @@ class Model_logic_u9xg extends Lin_Model {
        $shop = $this->shop->read($info['shop']);
        if(empty($shop['yyid'])){
             //如果没有在u9上设置店铺的组织 那么需要设置
-            $this->editData($info['zq_u9_id'],['dc_status'=>-1,'update_time'=>time()],$info['number'],1,1,'',[],$this->logic_tools->ret_arr(-1,'店铺没有在u9平台设置参数'));
+            $this->editData($info['zq_u9_id'],['xs_two_status'=>-1,'update_time'=>time()],$info['number'],1,1,'',[],$this->logic_tools->ret_arr(-1,'店铺没有在u9平台设置参数'));
             return ;
        }
 

core/CoreApp/models/Model_settingtest.php

@@ -20,7 +20,7 @@ class Model_settingtest extends Lin_Model
 		// if(($yytokentime - $time) < 0)
 		// {
 			/** 获取Token **/
-			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=001&orgCode=101&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
+			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=9966&orgCode=101&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -53,7 +53,7 @@ class Model_settingtest extends Lin_Model
 		// if(($yytokentime - $time) < 0)
 		// {
 			/** 获取Token **/
-			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=001&orgCode=120&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
+			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=9966&orgCode=120&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -86,7 +86,7 @@ class Model_settingtest extends Lin_Model
 		// if(($yytokentime - $time) < 0)
 		// {
 			/** 获取Token **/
-			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=001&orgCode=130&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
+			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=9966&orgCode=130&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -118,7 +118,7 @@ class Model_settingtest extends Lin_Model
 		// if(($yytokentime - $time) < 0)
 		// {
 			/** 获取Token **/
-			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=001&orgCode=140&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
+			$url = 'http://139.129.33.38:80/U9C/webapi/OAuth2/AuthLogin?clientid=test&entCode=9966&orgCode=140&clientsecret='.$setting['yy-clientsecret']['svalue'].'&userCode='.$setting['yy-usercode']['svalue'];
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);