|
@@ -22,7 +22,7 @@ class WigsOutCtrl{
|
|
|
$shop = $this->common->my_filter_input($_GET['shop']);
|
|
$shop = $this->common->my_filter_input($_GET['shop']);
|
|
|
$status = $this->common->my_filter_input($_GET['status']);
|
|
$status = $this->common->my_filter_input($_GET['status']);
|
|
|
$type = $this->common->my_filter_input($_GET['type']);
|
|
$type = $this->common->my_filter_input($_GET['type']);
|
|
|
- $time_type=isset($_GET['time_type'])?$this->common->my_filter_input($_GET['time_type']):1;
|
|
|
|
|
|
|
+ $time_type=isset($_GET['time_type'])?$this->common->my_filter_input($_GET['time_type']):1;
|
|
|
$startDate = $_GET['startDate'] . ' 00:00:00';
|
|
$startDate = $_GET['startDate'] . ' 00:00:00';
|
|
|
$endDate = $_GET['endDate'].' 23:59:59';
|
|
$endDate = $_GET['endDate'].' 23:59:59';
|
|
|
$key = $this->common->my_filter_input($_GET['key']);
|
|
$key = $this->common->my_filter_input($_GET['key']);
|
|
@@ -52,7 +52,6 @@ class WigsOutCtrl{
|
|
|
default:
|
|
default:
|
|
|
$shop_type = '';
|
|
$shop_type = '';
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
$offset = ($now-1)*$pnsn;
|
|
$offset = ($now-1)*$pnsn;
|
|
|
$sql = 'SELECT `oid`,`order_barcode`,`order_status`,`goods_no`,`goods_info`,`out_time`,`gir`,`in_time`,`print_time`,`memo`,`transport`,`print_times`,`print_date` ';
|
|
$sql = 'SELECT `oid`,`order_barcode`,`order_status`,`goods_no`,`goods_info`,`out_time`,`gir`,`in_time`,`print_time`,`memo`,`transport`,`print_times`,`print_date` ';
|
|
|
$sql .= 'FROM `app_wigsout` ';
|
|
$sql .= 'FROM `app_wigsout` ';
|
|
@@ -756,7 +755,7 @@ class WigsOutCtrl{
|
|
|
$str = '';
|
|
$str = '';
|
|
|
$arr = array();
|
|
$arr = array();
|
|
|
foreach($rs as $val){
|
|
foreach($rs as $val){
|
|
|
- $str = '<div class="str_box">'.$val['order_barcode'] . '*' . $val['goods_info'] . '*' . $val['transport'] . '*' . $val['print_time'].'</div>';
|
|
|
|
|
|
|
+ $str = $val['order_barcode'] . '*' . $val['goods_info'] . '*' . $val['transport'] . '*' . $val['print_time'];
|
|
|
$arr[] = array(
|
|
$arr[] = array(
|
|
|
'barcode' => $val['order_barcode'],
|
|
'barcode' => $val['order_barcode'],
|
|
|
'str' => $str
|
|
'str' => $str
|
chengwl