|
@@ -269,7 +269,8 @@ class Model_logic_u9xg extends Lin_Model {
|
|
|
$this->editData($info['zq_u9_id'],['dc_status'=>-1,'update_time'=>time()],$info['number'],1,1,'lpck',$r['msg'][1],$r['msg'][0]);
|
|
$this->editData($info['zq_u9_id'],['dc_status'=>-1,'update_time'=>time()],$info['number'],1,1,'lpck',$r['msg'][1],$r['msg'][0]);
|
|
|
return ;
|
|
return ;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ $dc_params = $r['data'];
|
|
|
//创建调出单
|
|
//创建调出单
|
|
|
$dcd_res = $this->apiyyv1->dcdCrate($dc_params,$this->getToken(130));
|
|
$dcd_res = $this->apiyyv1->dcdCrate($dc_params,$this->getToken(130));
|
|
|
|
|
|
|
@@ -523,8 +524,12 @@ class Model_logic_u9xg extends Lin_Model {
|
|
|
foreach($r[0]['Data'] as $k=>$v)
|
|
foreach($r[0]['Data'] as $k=>$v)
|
|
|
{
|
|
{
|
|
|
foreach($info['list'] as $kk => $vv){
|
|
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]['is_register'] = 1;
|
|
|
|
|
+ $info['list'][$kk]['jm'] = $v['m_code'];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -535,22 +540,22 @@ class Model_logic_u9xg extends Lin_Model {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(empty($unregister_goods)){
|
|
if(empty($unregister_goods)){
|
|
|
- return $this->logic_tools->ret_arr(1,"料品无异常");
|
|
|
|
|
|
|
+ return $this->logic_tools->ret_arr(1,"料品无异常",$info);
|
|
|
}
|
|
}
|
|
|
$tb_info = $info;
|
|
$tb_info = $info;
|
|
|
$tb_info['list'] = $unregister_goods;
|
|
$tb_info['list'] = $unregister_goods;
|
|
|
// //return $this->tbXgLp($tb_info,$token);
|
|
// //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));
|
|
$rr = $this->apiyyv1->tbLp($tb_info,$this->getToken(130));
|
|
|
|
|
|
|
|
if($rr[0]['Success']){
|
|
if($rr[0]['Success']){
|
|
|
- return $this->logic_tools->ret_arr(1,$rr);
|
|
|
|
|
|
|
+ return $this->logic_tools->ret_arr(1,$rr,$info);
|
|
|
}else{
|
|
}else{
|
|
|
- return $this->logic_tools->ret_arr(-1,$rr);
|
|
|
|
|
|
|
+ return $this->logic_tools->ret_arr(-1,$rr,$info);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
//添加料品并且下发
|
|
//添加料品并且下发
|