|
@@ -1179,59 +1179,59 @@ class Zzququeu9 extends Start_Controller {
|
|
|
$type_list = $this->zzquque_u9->getType();
|
|
$type_list = $this->zzquque_u9->getType();
|
|
|
$list = [];
|
|
$list = [];
|
|
|
foreach($info_list as $k=>$v){
|
|
foreach($info_list as $k=>$v){
|
|
|
- $bzsh_no = $v['bzsh_no'];
|
|
|
|
|
- if($v['bzsh_status'] == 0){
|
|
|
|
|
|
|
+ $bzsh_no = empty($v['bzsh_no'])?"":$v['bzsh_no'];
|
|
|
|
|
+ // if($v['bzsh_status'] == 0){
|
|
|
|
|
|
|
|
- $bzsh_no = "<span data-action='wxcprk' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>";
|
|
|
|
|
|
|
+ // $bzsh_no = "<span data-action='wxcprk' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>";
|
|
|
|
|
|
|
|
|
|
|
|
|
- }elseif($v['bzsh_status'] == -1){
|
|
|
|
|
- $error = $this->zzququeu9_logs->find_all("oid = ".$v['id']." and one_type = 20 and two_type = 1 ","*",'id desc',0,1);
|
|
|
|
|
|
|
+ // }elseif($v['bzsh_status'] == -1){
|
|
|
|
|
+ // $error = $this->zzququeu9_logs->find_all("oid = ".$v['id']." and one_type = 20 and two_type = 1 ","*",'id desc',0,1);
|
|
|
|
|
|
|
|
- $tmp_str= "";
|
|
|
|
|
- if(isset($error[0]['ret_data'])){
|
|
|
|
|
- $ret_data = json_decode($error[0]['ret_data'],true);
|
|
|
|
|
- if(isset($ret_data[0]["ResMsg"])){
|
|
|
|
|
- $tmp_str = $ret_data[0]["ResMsg"];
|
|
|
|
|
- }elseif(isset($ret_data['msg'])){
|
|
|
|
|
- $tmp_str = $ret_data['msg'];
|
|
|
|
|
- }elseif(isset($ret_data['Data'])){
|
|
|
|
|
- foreach($ret_data['Data'] as $iit){
|
|
|
|
|
- if(!$iit['m_isSucess']){
|
|
|
|
|
- $tmp_str .= $iit['m_errorMsg']."<br>";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // $tmp_str= "";
|
|
|
|
|
+ // if(isset($error[0]['ret_data'])){
|
|
|
|
|
+ // $ret_data = json_decode($error[0]['ret_data'],true);
|
|
|
|
|
+ // if(isset($ret_data[0]["ResMsg"])){
|
|
|
|
|
+ // $tmp_str = $ret_data[0]["ResMsg"];
|
|
|
|
|
+ // }elseif(isset($ret_data['msg'])){
|
|
|
|
|
+ // $tmp_str = $ret_data['msg'];
|
|
|
|
|
+ // }elseif(isset($ret_data['Data'])){
|
|
|
|
|
+ // foreach($ret_data['Data'] as $iit){
|
|
|
|
|
+ // if(!$iit['m_isSucess']){
|
|
|
|
|
+ // $tmp_str .= $iit['m_errorMsg']."<br>";
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
- }else{
|
|
|
|
|
- $tmp_str = "系统执行失败，请重试";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // }else{
|
|
|
|
|
+ // $tmp_str = "系统执行失败，请重试";
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
- }else{
|
|
|
|
|
- $tmp_str = "";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // }else{
|
|
|
|
|
+ // $tmp_str = "";
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
- $bzsh_no = "<span data-action='wxcprk' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>".'<p style="color:blue"><i class="method fa fa-exclamation-circle" data-t="'.$tmp_str.'"></i><p>';
|
|
|
|
|
- }elseif($v['bzsh_status'] == 1){
|
|
|
|
|
- $bzsh_no = $v['bzsh_no']."<br/><span data-action='wxcprksh' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // $bzsh_no = "<span data-action='wxcprk' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>".'<p style="color:blue"><i class="method fa fa-exclamation-circle" data-t="'.$tmp_str.'"></i><p>';
|
|
|
|
|
+ // }elseif($v['bzsh_status'] == 1){
|
|
|
|
|
+ // $bzsh_no = $v['bzsh_no']."<br/><span data-action='wxcprksh' data-process='1' data-id='".$v['id']."' onclick='doAction(this)'>创建成品入库单</span>";
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
|
|
|
|
- $xs_no = " ";
|
|
|
|
|
- if($v['xs_status'] == -1){
|
|
|
|
|
- $xs_no .= "<span data-action='wxxs' data-process='1' onclick='doAction(this)' data-id='".$v['id']."' >创建销售单</span>";
|
|
|
|
|
- }elseif($v['xs_status'] == 0){
|
|
|
|
|
- $xs_no .= "<span data-action='wxxs' data-process='1' onclick='doAction(this)' data-id='".$v['id']."' >创建销售单</span>";
|
|
|
|
|
- }
|
|
|
|
|
- if(!empty($v['xs_no'])){
|
|
|
|
|
- $xs_no = $v['xs_no']."<br/>".$xs_no;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ $xs_no =$v['xs_no'];
|
|
|
|
|
+ // if($v['xs_status'] == -1){
|
|
|
|
|
+ // $xs_no .= "<span data-action='wxxs' data-process='1' onclick='doAction(this)' data-id='".$v['id']."' >创建销售单</span>";
|
|
|
|
|
+ // }elseif($v['xs_status'] == 0){
|
|
|
|
|
+ // $xs_no .= "<span data-action='wxxs' data-process='1' onclick='doAction(this)' data-id='".$v['id']."' >创建销售单</span>";
|
|
|
|
|
+ // }
|
|
|
|
|
+ // if(!empty($v['xs_no'])){
|
|
|
|
|
+ // $xs_no = $v['xs_no']."<br/>".$xs_no;
|
|
|
|
|
+ // }
|
|
|
$bzch_no = empty($v['bzch_no'])?"":$v['bzch_no'];
|
|
$bzch_no = empty($v['bzch_no'])?"":$v['bzch_no'];
|
|
|
|
|
|
|
|
$list[] = [
|
|
$list[] = [
|
|
|
'id'=>$v['id'],
|
|
'id'=>$v['id'],
|
|
|
'order_no'=>$v['order_no'],
|
|
'order_no'=>$v['order_no'],
|
|
|
- 'type'=>"工厂外销单",
|
|
|
|
|
|
|
+ 'type'=>"美店备货",
|
|
|
'bzsh_no'=> $bzsh_no,
|
|
'bzsh_no'=> $bzsh_no,
|
|
|
'xs_no'=>$xs_no,
|
|
'xs_no'=>$xs_no,
|
|
|
'bzch_no'=>$bzch_no,
|
|
'bzch_no'=>$bzch_no,
|
