|
@@ -1487,6 +1487,8 @@ class Systemfout extends Start_Controller {
|
|
|
|
|
|
|
|
$classid = $classid = $this->classid->sku();
|
|
$classid = $classid = $this->classid->sku();
|
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
|
|
|
+ $tmp_jm = "";
|
|
|
|
|
+ $tmp_zh = "";
|
|
|
foreach ($dbapi as $va)
|
|
foreach ($dbapi as $va)
|
|
|
{
|
|
{
|
|
|
$pm = $classid;
|
|
$pm = $classid;
|
|
@@ -1559,12 +1561,14 @@ class Systemfout extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
$jm = array_filter($jm);//去除空值
|
|
$jm = array_filter($jm);//去除空值
|
|
|
$jm = implode("-",$jm);
|
|
$jm = implode("-",$jm);
|
|
|
|
|
+ $tmp_jm .= $jm.";";
|
|
|
$pm = array_filter($pm);//去除空值
|
|
$pm = array_filter($pm);//去除空值
|
|
|
$zh = implode(" ",$pm);
|
|
$zh = implode(" ",$pm);
|
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
|
|
|
+ $tmp_zh .= $zh.";";
|
|
|
}
|
|
}
|
|
|
- $info_list[$key]['jm'] = $jm;
|
|
|
|
|
- $info_list[$key]['zh'] = $zh;
|
|
|
|
|
|
|
+ $info_list[$key]['jm'] = trim($tmp_jm,';');
|
|
|
|
|
+ $info_list[$key]['zh'] = trim($tmp_zh,';');
|
|
|
}
|
|
}
|
|
|
//取得信息列表
|
|
//取得信息列表
|
|
|
$info_listsmt = $this->fullordersmt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
|
|
$info_listsmt = $this->fullordersmt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
|
|
@@ -1615,6 +1619,8 @@ class Systemfout extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
$classid = $classid = $this->classid->sku();
|
|
$classid = $classid = $this->classid->sku();
|
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
|
|
|
+ $tmp_jm = "";
|
|
|
|
|
+ $tmp_zh = "";
|
|
|
foreach ($dbapi as $va)
|
|
foreach ($dbapi as $va)
|
|
|
{
|
|
{
|
|
|
$pm = $classid;
|
|
$pm = $classid;
|
|
@@ -1690,9 +1696,12 @@ class Systemfout extends Start_Controller {
|
|
|
$pm = array_filter($pm);//去除空值
|
|
$pm = array_filter($pm);//去除空值
|
|
|
$zh = implode(" ",$pm);
|
|
$zh = implode(" ",$pm);
|
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
|
- }
|
|
|
|
|
- $info_listsmt[$key]['jm'] = $jm;
|
|
|
|
|
- $info_listsmt[$key]['zh'] = $zh;
|
|
|
|
|
|
|
+ $tmp_jm .= $jm.";";
|
|
|
|
|
+ $tmp_zh .= $zh.";";
|
|
|
|
|
+ }
|
|
|
|
|
+ $info_listsmt[$key]['jm'] = trim($tmp_jm,';');
|
|
|
|
|
+ $info_listsmt[$key]['zh'] = trim($tmp_zh,';');
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
//取得信息列表
|
|
//取得信息列表
|
|
|
$info_listtt = $this->fullordertt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
|
|
$info_listtt = $this->fullordertt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
|
|
@@ -1742,6 +1751,8 @@ class Systemfout extends Start_Controller {
|
|
|
$info_listtt[$key]['librarytime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['librarytime']).'</em>';
|
|
$info_listtt[$key]['librarytime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['librarytime']).'</em>';
|
|
|
}
|
|
}
|
|
|
$classid = $classid = $this->classid->sku();
|
|
$classid = $classid = $this->classid->sku();
|
|
|
|
|
+ $tmp_jm = "";
|
|
|
|
|
+ $tmp_zh = "";
|
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
|
foreach ($dbapi as $va)
|
|
foreach ($dbapi as $va)
|
|
|
{
|
|
{
|
|
@@ -1818,9 +1829,11 @@ class Systemfout extends Start_Controller {
|
|
|
$pm = array_filter($pm);//去除空值
|
|
$pm = array_filter($pm);//去除空值
|
|
|
$zh = implode(" ",$pm);
|
|
$zh = implode(" ",$pm);
|
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
|
|
|
+ $tmp_jm .= $jm.";";
|
|
|
|
|
+ $tmp_zh .= $zh.";";
|
|
|
}
|
|
}
|
|
|
- $info_listtt[$key]['jm'] = $jm;
|
|
|
|
|
- $info_listtt[$key]['zh'] = $zh;
|
|
|
|
|
|
|
+ $info_listtt[$key]['jm'] = trim($tmp_jm,';');
|
|
|
|
|
+ $info_listtt[$key]['zh'] = trim($tmp_zh,';');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1873,6 +1886,8 @@ class Systemfout extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
$classid = $classid = $this->classid->sku();
|
|
$classid = $classid = $this->classid->sku();
|
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
$dbapi = explode(';',trim($value['fpdata'],';'));
|
|
|
|
|
+ $tmp_jm = "";
|
|
|
|
|
+ $tmp_zh = "";
|
|
|
foreach ($dbapi as $va)
|
|
foreach ($dbapi as $va)
|
|
|
{
|
|
{
|
|
|
$pm = $classid;
|
|
$pm = $classid;
|
|
@@ -1948,9 +1963,11 @@ class Systemfout extends Start_Controller {
|
|
|
$pm = array_filter($pm);//去除空值
|
|
$pm = array_filter($pm);//去除空值
|
|
|
$zh = implode(" ",$pm);
|
|
$zh = implode(" ",$pm);
|
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));
|
|
|
|
|
+ $tmp_jm .= $jm.";";
|
|
|
|
|
+ $tmp_zh .= $zh.";";
|
|
|
}
|
|
}
|
|
|
- $info_listamz[$key]['jm'] = $jm;
|
|
|
|
|
- $info_listamz[$key]['zh'] = $zh;
|
|
|
|
|
|
|
+ $info_listamz[$key]['jm'] = trim($tmp_jm,';');
|
|
|
|
|
+ $info_listamz[$key]['zh'] = trim($tmp_zh,';');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
