Przeglądaj źródła

修改在途的大小写

lvhao 2 tygodni temu
rodzic
commit
ed765954ab

+ 11 - 6
core/CoreApp/models/Model_logic_u9zt.php

@@ -125,6 +125,7 @@ class Model_logic_u9zt extends Lin_Model {
             $this->editData($info['id'],['dc_status'=>-1,'update_time'=>time()],$info['order_no'],1,1,'lpck',$r['msg'][1],$r['msg'][0]);
             return ;
       }
+      $dc_params = $r['data'];
        //创建调出单
        $dcd_res = $this->apiyyv1->dcdCrate($dc_params,$this->getToken(130));
        if(empty($dcd_res[0]['Data'][0]["Code"])){
@@ -415,8 +416,12 @@ class Model_logic_u9zt extends Lin_Model {
         foreach($r[0]['Data'] as $k=>$v)
         {
             foreach($info['list'] as $kk => $vv){
-                if($v['m_code'] == $vv['jm']){
+                // if($v['m_code'] == $vv['jm']){
+                //     $info['list'][$kk]['is_register'] = 1;
+                // }
+                if(strtolower($v['m_code']) == strtolower($vv['jm'])){
                     $info['list'][$kk]['is_register'] = 1;
+                    $info['list'][$kk]['jm']  = $v['m_code'];
                 }
             }
         }
@@ -428,21 +433,21 @@ class Model_logic_u9zt extends Lin_Model {
         
        
         if(empty($unregister_goods)){
-            return $this->logic_tools->ret_arr(1,"料品无异常");
+            return $this->logic_tools->ret_arr(1,"料品无异常",$info);
         }
         $tb_info =  $info;
         $tb_info['list'] = $unregister_goods;
         // //return $this->tbXgLp($tb_info,$token);
-        return $this->tbXgLp($tb_info);
+        return $this->tbXgLp($tb_info,$info);
     }
     //将许昌仓的料品同步到香港仓
-    public function tbXgLp($tb_info){
+    public function tbXgLp($tb_info,$info){
        
         $rr = $this->apiyyv1->tbLp($tb_info,$this->getToken(130));
         if($rr[0]['Success']){
-            return $this->logic_tools->ret_arr(1,$rr);
+            return $this->logic_tools->ret_arr(1,$rr,$info);
         }else{
-            return $this->logic_tools->ret_arr(-1,$rr);
+            return $this->logic_tools->ret_arr(-1,$rr,$info);
         }
     }
     

+ 12 - 6
core/CoreApp/models/Model_logic_u9ztsd.php

@@ -128,6 +128,7 @@ class Model_logic_u9ztsd extends Lin_Model {
             $this->editData($info['id'],['dc_status'=>-1,'update_time'=>time()],$info['order_no'],1,1,'lpck',$r['msg'][1],$r['msg'][0]);
             return $this->logic_tools->ret_arr(-1,"同步料品失败");
       }
+      $dc_params = $r['data'];
        //创建调出单
        $dcd_res = $this->apiyyv1->dcdCrate($dc_params,$this->getToken(130));
        if(empty($dcd_res[0]['Data'][0]["Code"])){
@@ -169,8 +170,13 @@ class Model_logic_u9ztsd extends Lin_Model {
         foreach($r[0]['Data'] as $k=>$v)
         {
             foreach($info['list'] as $kk => $vv){
-                if($v['m_code'] == $vv['jm']){
+                // if($v['m_code'] == $vv['jm']){
+                //     $info['list'][$kk]['is_register'] = 1;
+                // }
+
+                if(strtolower($v['m_code']) == strtolower($vv['jm'])){
                     $info['list'][$kk]['is_register'] = 1;
+                    $info['list'][$kk]['jm']  = $v['m_code'];
                 }
             }
         }
@@ -182,21 +188,21 @@ class Model_logic_u9ztsd extends Lin_Model {
         
        
         if(empty($unregister_goods)){
-            return $this->logic_tools->ret_arr(1,"料品无异常");
+            return $this->logic_tools->ret_arr(1,"料品无异常",$info);
         }
         $tb_info =  $info;
         $tb_info['list'] = $unregister_goods;
         // //return $this->tbXgLp($tb_info,$token);
-        return $this->tbXgLp($tb_info);
+        return $this->tbXgLp($tb_info,$info);
     }
     //将许昌仓的料品同步到香港仓
-    public function tbXgLp($tb_info){
+    public function tbXgLp($tb_info,$info){
        
         $rr = $this->apiyyv1->tbLp($tb_info,$this->getToken(130));
         if($rr[0]['Success']){
-            return $this->logic_tools->ret_arr(1,$rr);
+            return $this->logic_tools->ret_arr(1,$rr,$info);
         }else{
-            return $this->logic_tools->ret_arr(-1,$rr);
+            return $this->logic_tools->ret_arr(-1,$rr,$info);
         }
     }