提交数据

core/CoreApp/controllers/Queueu9.php

@@ -30,6 +30,9 @@ class Queueu9 extends Start_Controller {
         }
     }
     public function _index(){
+         //新加一步  查询修改调出单的审核结果
+         $list = $this->zzquque_u9->find_all("type = 10 and order_no = 'ALIP-50228-022'");
+         $this->logic_u9xg->xdlsOneExtraStep($list);
         //执行第一步的参数
         // $list = $this->zzquque_u9->find_all();
         // $do_list = [];
@@ -79,11 +82,15 @@ class Queueu9 extends Start_Controller {
             $tmp_info['zq_u9_id'] = $v['id'];
             $do_list[] = $tmp_info;
         }
-       
         $this->logic_u9xg->xdlsOneStep($do_list);
         sleep(3);
+        //新加一步  查询修改调出单的审核结果
+        $list = $this->zzquque_u9->find_all("type = 10 and dc_status = 1 and cg_status = 0 and xs_status = 0 ",'*','id asc',0,5);
+        $this->logic_u9xg->xdlsOneExtraStep($list);
+
+        
         //第二步 提交审核第一步的采购单和销售单
-        $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 1 and cg_status = 1 and xs_status = 1  ");
+        $list =  $this->zzquque_u9->find_all("type = 10 and dc_status = 3 and cg_status = 1 and xs_status = 1  ");
       
         $this->logic_u9xg->xdlsTwoStep($list);
         //第三步  查询调出单生成的调入单是否生成 如果生成了就审核 如果没生成 说明异常了 这种都是按步骤走的

core/CoreApp/models/Model_apiyyv1.php

@@ -327,7 +327,16 @@ class Model_apiyyv1 extends Lin_Model
 		$res = $this->sendReq($url,$header,json_encode($list));
 		return array($res,$list);
 	}
-
+	//由于逻辑修改造成 需要查询调出单是审核完毕
+	public function xdlsCxDcd($dcd_no,$token){
+		$list["SqlString"] = "select * from InvDoc_TransIn as a left  join InvDoc_TransInLine as b on a.id=b.TransferIn where Status = 2 and a.DocNo = '".$dcd_no."'";
+		$url = '/U9C/webapi/QueryCommon/QueryInfoBySql';
+		$url = $this->base_url.$url;
+		$header[] = "Content-Type: application/json";
+        $header[] = "Token: ".$token;
+		$res = $this->sendReq($url,$header,json_encode($list));
+		return array($res,$list);
+	}
 
 
 	public function sendReq($url,$header,$list){

core/CoreApp/models/Model_logic_u9xg.php

@@ -51,6 +51,12 @@ class Model_logic_u9xg extends Lin_Model {
             $this->xdlsBeforeCreate($v,$pre_data['typeclass'],$pre_data['classid']);
         }
     }
+    //修正原来的逻辑  调出单审核完成后才可以在批量执行后续订单
+    public function xdlsOneExtraStep($list){
+        foreach($list as $k=>$v){
+            $this->xdlsCxDcd($v);
+        }
+    }
     //循环执行许昌仓的销售单 调出单和香港仓的采购单  提交  顺带的也执行审核
     public function xdlsTwoStep($list){
         foreach($list as $k=>$v){
@@ -269,24 +275,24 @@ class Model_logic_u9xg extends Lin_Model {
        $dcd_no =  $dcd_res[0]['Data'][0]["Code"];
        $this->editData($info['zq_u9_id'],['dc_no'=>$dcd_no,'dc_status'=>1,'update_time'=>time()],$info['number'],1,1,'dc',$dcd_res[1],$dcd_res[0]);
 
-        //创建许昌成品库的销售单
-        $xsd_res = $this->apiyyv1->xsdCreate($dc_params,$this->getToken(130));
-        if(empty($xsd_res[0]['Data'][0]['m_code'])){
-            $this->editData($info['zq_u9_id'],['xs_status'=>-1,'update_time'=>time()],$info['number'],2,1,'xs',$xsd_res[1],$xsd_res[0]);
-            return ;
-        }
-        //更新销售单数据
-       $xs_no = $xsd_res[0]['Data'][0]["m_code"];
-       $this->editData($info['zq_u9_id'],['xs_no'=>$xs_no,'xs_status'=>1,'update_time'=>time()],$info['number'],2,1,'xs',$xsd_res[1],$xsd_res[0]);
+    //     //创建许昌成品库的销售单
+    //     $xsd_res = $this->apiyyv1->xsdCreate($dc_params,$this->getToken(130));
+    //     if(empty($xsd_res[0]['Data'][0]['m_code'])){
+    //         $this->editData($info['zq_u9_id'],['xs_status'=>-1,'update_time'=>time()],$info['number'],2,1,'xs',$xsd_res[1],$xsd_res[0]);
+    //         return ;
+    //     }
+    //     //更新销售单数据
+    //    $xs_no = $xsd_res[0]['Data'][0]["m_code"];
+    //    $this->editData($info['zq_u9_id'],['xs_no'=>$xs_no,'xs_status'=>1,'update_time'=>time()],$info['number'],2,1,'xs',$xsd_res[1],$xsd_res[0]);
 
-        //创建香港公司的采购单
-        $cgd_res = $this->apiyyv1->cgdCreate($dc_params,$this->getToken(140));
-        if(empty($cgd_res[0]['Data'][0]["Code"])){
-            $this->editData($info['zq_u9_id'],['cg_status'=>-1,'update_time'=>time()],$info['number'],3,1,'cg',$cgd_res[1],$cgd_res[0]);
-            return ;
-        }
+    //     //创建香港公司的采购单
+    //     $cgd_res = $this->apiyyv1->cgdCreate($dc_params,$this->getToken(140));
+    //     if(empty($cgd_res[0]['Data'][0]["Code"])){
+    //         $this->editData($info['zq_u9_id'],['cg_status'=>-1,'update_time'=>time()],$info['number'],3,1,'cg',$cgd_res[1],$cgd_res[0]);
+    //         return ;
+    //     }
 
-        $this->editData($info['zq_u9_id'],['cg_no'=>$cgd_res[0]['Data'][0]["Code"],'cg_status'=>1,'update_time'=>time()],$info['number'],3,1,'cg',$cgd_res[1],$cgd_res[0]);
+    //     $this->editData($info['zq_u9_id'],['cg_no'=>$cgd_res[0]['Data'][0]["Code"],'cg_status'=>1,'update_time'=>time()],$info['number'],3,1,'cg',$cgd_res[1],$cgd_res[0]);
         return ;
     }
     
@@ -531,4 +537,12 @@ class Model_logic_u9xg extends Lin_Model {
             'read_time'=>date("Y-m-d H:i:s")
         ]);
     }
+
+    public function xdlsCxDcd($info){
+        $r = $this->apiyyv1->xdlsCxDcd($info['dc_no'],$this->getToken(130));
+        echo '<pre>';
+        var_dump($r);
+        die;
+
+    }
 }

template/erp/zzququeu9.html

@@ -107,6 +107,7 @@
                 $(this).find('td:eq(1)').css("width", "8%");
                 $(this).find('td:eq(2)').css("width", "8%");
                 $(this).find('td:eq(3)').css("width", "8%");
+                $(this).find('td:eq(4)').css("width", "8%");
                 $(this).find('td:eq(5)').css("width", "8%");
                 $(this).find('td:eq(6)').css("width", "8%");
                 $(this).find('td:eq(7)').css("width", "8%");