longyi 5 bulan lalu
induk
melakukan
d9417cb034

+ 5 - 3
core/CoreApp/controllers/Ac.php

@@ -219,12 +219,14 @@ class Ac extends Start_Controller {
 	//	$fullorder['printcode'] = 'HUALEI-DHL';
 // 		$fullorder['js'] = 2;
 // 		$fullorder['bx'] = 110;
-		//$fullorder['qm'] = 1;
+		$fullorder['qm'] = 1;
 // 		$fullorder['printcode'] = 'usps_priority';
 // 		$b  = $this->cne->get_data($fullorder);
-		//$b = $this->fedexv1->get_data($fullorder);
+        echo "<pre>";
+		$b = $this->fedexv1->get_data($fullorder);
+		var_dump($b);
 		//echo $fullorder['zzl'];
-		echo  "<pre>";
+	//	echo  "<pre>";
 	//	var_dump($fullorder);
 		//$b = $this->usps->get_data_new($fullorder);
 		

+ 2 - 4
core/CoreApp/controllers/Queueu9.php

@@ -71,17 +71,15 @@ 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'");
-        $list =  $this->zzquque_u9->find_all("type = 10 and  order_no = 'QQS-50228-020'");
+        $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 0 and cg_status = 0 and xs_status = 0 ",'*','id asc',0,5);
         $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'];
             $do_list[] = $tmp_info;
         }
-        
+       
         $this->logic_u9xg->xdlsOneStep($do_list);
         sleep(3);
         //第二步 提交审核第一步的采购单和销售单

+ 39 - 25
core/CoreApp/controllers/Zzququeu9.php

@@ -78,7 +78,7 @@ class Zzququeu9 extends Start_Controller {
                     $start = ($page - 1)*$perpage;
                }
 			
-               $info_list = $this->zzquque_u9->find_all($where,'*','id desc',$start,$perpage);
+               $info_list = $this->zzquque_u9->find_all($where,'*','id asc',$start,$perpage);
                $type_list = $this->zzquque_u9->getType();
                $list = [];
                foreach($info_list as $k=>$v){
@@ -92,86 +92,100 @@ class Zzququeu9 extends Start_Controller {
                     }elseif($v['dc_status'] == 2){
                          $dc_no = "<span data-action='dc' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调出单</span>";
                     }elseif($v['dc_status'] == -2){
-                         $dc_no = "<span data-action='dc' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交调出单</span>";
+                         $dc_no = "<span data-action='dc' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交调出单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['dc_status'] == -3){
-                         $dc_no = "<span data-action='dc' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调出单</span>";
+                         $dc_no = "<span data-action='dc' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调出单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }
                     if(!empty($v['dc_no'])){
                          $dc_no = $v['dc_no']."<br/>".$dc_no;
                     }
-                    $cg_no = empty($v['cg_no'])?"":$v['cg_no'];
+                    $cg_no = "";
                     if($v['cg_status'] == 0){
                          $cg_no .= "<span  data-action='cg' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建采购单</span>";
                     }elseif($v['cg_status'] == 1){
                          $cg_no .= "<span data-action='cg' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交采购单</span>";
                     }elseif($v['cg_status'] == -1){
-                         $cg_no .= "<span data-action='cg' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建采购单</span>";
+                         $cg_no .= "<span data-action='cg' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建采购单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['cg_status'] == 2){
                          $cg_no .= "<span data-action='cg' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核采购单</span>";
                     }elseif($v['cg_status'] == -2){
-                         $cg_no .= "<span data-action='cg' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交采购单</span>";
+                         $cg_no .= "<span data-action='cg' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交采购单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['cg_status'] == -3){
-                         $cg_no .= "<span data-action='cg' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核采购单</span>";
+                         $cg_no .= "<span data-action='cg' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核采购单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }
-
-                    $xs_no = empty($v['xs_no'])?"":$v['xs_no'];
+                    if(!empty($v['cg_no'])){
+                         $cg_no = $v['cg_no']."<br/>".$cg_no;
+                    }
+                    $xs_no = "";
                     if($v['xs_status'] == 0){
                          $xs_no .= "<span  data-action='xs' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>";
                     }elseif($v['xs_status'] == 1){
                          $xs_no .= "<span data-action='xs' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>";
                     }elseif($v['xs_status'] == -1){
-                         $xs_no .= "<span data-action='xs' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>";
+                         $xs_no .= "<span data-action='xs' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['xs_status'] == 2){
                          $xs_no .= "<span data-action='xs' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>";
                     }elseif($v['xs_status'] == -2){
-                         $xs_no .= "<span data-action='xs' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>";
+                         $xs_no .= "<span data-action='xs' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['xs_status'] == -3){
-                         $xs_no .= "<span data-action='xs' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>";
+                         $xs_no .= "<span data-action='xs' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
+                    }
+                    if(!empty($v['xs_no'])){
+                         $xs_no = $v['xs_no']."<br/>".$xs_no;
                     }
-                    $xs_two_no = empty($v['xs_two_no'])?"":$v['xs_two_no'];
+                    $xs_two_no ='';
                     if($v['xs_two_status'] == 0){
                          $xs_two_no .= "<span  data-action='xs_two' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>";
                     }elseif($v['xs_two_status'] == 1){
                          $xs_two_no .= "<span data-action='xs_two' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>";
                     }elseif($v['xs_two_status'] == -1){
-                         $xs_two_no .= "<span data-action='xs_two' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>";
+                         $xs_two_no .= "<span data-action='xs_two' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['xs_two_status'] == 2){
                          $xs_two_no .= "<span data-action='xs_two' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>";
                     }elseif($v['xs_two_status'] == -2){
-                         $xs_two_no .= "<span data-action='xs_two' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>";
+                         $xs_two_no .= "<span data-action='xs_two' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['xs_two_status'] == -3){
-                         $xs_two_no  .= "<span data-action='xs_two' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>";
+                         $xs_two_no  .= "<span data-action='xs_two' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核销售单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
+                    }
+                    if(!empty($v['xs_two_no'])){
+                         $xs_two_no = $v['xs_two_no']."<br/>".$xs_two_no;
                     }
-                    $bzch_no =empty($v['bzch_no'])?"":$v['bzch_no'];
+                    
+                    $bzch_no ="";
                     if($v['bzch_status'] == 0){
                          $bzch_no  .= "<span  data-action='bzch' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建出货单</span>";
                     }elseif($v['bzch_status'] == 1){
                          $bzch_no .= "<span data-action='bzch' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交出货单</span>";
                     }elseif($v['bzch_status'] == -1){
-                         $bzch_no .= "<span data-action='bzch' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建出货单</span>";
+                         $bzch_no .= "<span data-action='bzch' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建出货单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['bzch_status'] == 2){
                          $bzch_no .= "<span data-action='bzch' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核出货单</span>";
                     }elseif($v['bzch_status'] == -2){
-                         $bzch_no .= "<span data-action='bzch' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交出货单</span>";
+                         $bzch_no .= "<span data-action='bzch' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交出货单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['bzch_status'] == -3){
-                         $bzch_no .= "<span data-action='bzch' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核出货单</span>";
+                         $bzch_no .= "<span data-action='bzch' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核出货单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }
                     //$bzsh_no =empty($v['bzsh_no'])?"":$v['bzsh_no'];
+                    if(!empty($v['bzch_no'])){
+                         $bzch_no = $v['bzch_no']."<br/>".$bzch_no;
+                    }
 
-
-                    $dr_no = empty($v['dr_no'])?"":$v['dr_no'];
+                    $dr_no = "";
                     if($v['dr_status'] == 0){
                          $dr_no .= "<span  data-action='dr' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建调入单</span>";
                     }elseif($v['dr_status'] == 1){
                          $dr_no .= "<span data-action='dr' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交调入单</span>";
                     }elseif($v['dr_status'] == -1){
-                         $dr_no .= "<span data-action='dr' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建调入单</span>";
+                         $dr_no .= "<span data-action='dr' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建调入单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['dr_status'] == 2){
                          $dr_no .= "<span data-action='dr' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调入单</span>";
                     }elseif($v['dr_status'] == -2){
-                         $dr_no .= "<span data-action='dr' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交调入单</span>";
+                         $dr_no .= "<span data-action='dr' data-process='2' data-id='".$v['id']."' onclick='doAction(this)'>提交调入单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
                     }elseif($v['dr_status'] == -3){
-                         $dr_no .= "<span data-action='dr' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调入单</span>";
+                         $dr_no .= "<span data-action='dr' data-process='3' data-id='".$v['id']."' onclick='doAction(this)'>审核调入单</span>".'<p style="color:blue"><i  class="method fa fa-exclamation-circle" data-t="123"></i><p>';
+                    }
+                    if(!empty($v['dr_no'])){
+                         $dr_no = $v['dr_no']."<br/>".$dr_no;
                     }
 
                     $list[] = [

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

@@ -480,6 +480,8 @@ class Model_apiyyv1 extends Lin_Model
 			'OtherID'=>$params['number'],
 			'DescFlexField'=>(object)[
 			],
+			'TC'=>'C009',
+			'AC'=>'C009',
 			"Memo"=>$params['number'],
 			'Supplier'=>[
 				'Code'=>$params['gys'],//供应商编码  到时间找下

+ 1 - 1
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 = '9966';//账套的code;
+    public $ztcode = '001';//账套的code;
     public $tb_org_arr =[101,110,130,140];//同步组织
     public $gys = "98002";//供应商  98001  龙盈  98002  龙熠
     //切记要修改token_120的token真正的token!!!!

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

@@ -7,7 +7,7 @@ class Model_logic_u9xgsd extends Lin_Model {
     public $xdcp_code = '13001';//许昌成品库的编码  测试的时候就用龙盈工厂的仓库
     public $xdxgzzcode = '140';//香港组织公司编码
     public $xdxgls_code = '14003';//香港临时库的编码   测试的时候用销售公司成品库的编码
-    public $ztcode = '9966';//账套的code;
+    public $ztcode = '001';//账套的code;
     public $tb_org_arr =[101,110,130,140];//同步组织
     public $gys = "98002";//供应商  98001  龙盈  98002  龙熠
     //切记要修改token_120的token真正的token!!!!

+ 4 - 4
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=9966&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=001&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=9966&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=001&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=9966&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=001&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=9966&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=001&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);