|
@@ -2306,6 +2306,8 @@ class Fullordersmt extends Start_Controller {
|
|
|
}
|
|
|
/** 合并信息处理结束开始 **/
|
|
|
echo json_encode(array('msg'=>'操作成功','success'=>true));exit;
|
|
|
+ }else{
|
|
|
+ echo json_encode(array('msg'=>'操作失败,请联系技术','success'=>false));exit;
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -2342,7 +2344,7 @@ class Fullordersmt extends Start_Controller {
|
|
|
echo json_encode(array('msg'=>'操作成功','success'=>false));exit;
|
|
|
}else{
|
|
|
$this->fullordersmt->save(array('waybill'=>$msg,'state'=>209,'dlz'=>2),$id);
|
|
|
- echo json_encode(array('msg'=>'声明失败:'.$result['error_msg'],'success'=>false));exit;
|
|
|
+ echo json_encode(array('msg'=>'声明失败:'.$result_t['error_msg'],'success'=>false));exit;
|
|
|
}
|
|
|
|
|
|
}
|