|
|
@@ -661,8 +661,10 @@ class Whlabel extends Start_Controller
|
|
|
$info_list[$key]['purchase'] = (isset($prc[$value['purchase']])) ? $prc[$value['purchase']] : '未知';
|
|
|
$c = $this->whlabel->find_all($where . ' and sku = "' . $value['sku'] . '" and state = 0 and warehouse = "' . $value['warehouse'] . '" and features = "' . $value['features'] . '"', 'details,cpid');
|
|
|
$z = $this->whlabel->find_all($where . ' and sku = "' . $value['sku'] . '" and zd != "" and state = 0 and warehouse = "' . $value['warehouse'] . '" and features = "' . $value['features'] . '"');
|
|
|
- $info_list[$key]['cpbz'] = $value['cpbz'] ;
|
|
|
- $info_list[$key]['label'] = $value['sm'];
|
|
|
+ $info_list[$key]['cpbz'] = empty($value['cpbz'])?$value['sm']:$value['cpbz']." ".$value['sm'] ;
|
|
|
+ $info_list[$key]['label'] = "";
|
|
|
+ // $info_list[$key]['cpbz'] = $value['cpbz'] ;
|
|
|
+ // $info_list[$key]['label'] = $value['sm'];
|
|
|
$number = $value['number'];
|
|
|
$ftime = time() - 15 * 24 * 3600;
|
|
|
$info_list[$key]['warehouse'] = $warehouse['title'];
|
|
|
@@ -1454,8 +1456,10 @@ class Whlabel extends Start_Controller
|
|
|
foreach ($od as $k => $vv) {
|
|
|
$odid .= $k . '数量' . $vv;
|
|
|
}
|
|
|
- $info_list[$key]['cpbz'] = $value['cpbz'] ;
|
|
|
- $info_list[$key]['label'] = $value['sm'];
|
|
|
+ $info_list[$key]['cpbz'] = empty($value['cpbz'])?$value['sm']: $value['cpbz']." ".$value['sm'];
|
|
|
+ $info_list[$key]['label'] = "";
|
|
|
+ // $info_list[$key]['cpbz'] = $value['cpbz'] ;
|
|
|
+ // $info_list[$key]['label'] = $value['sm'];
|
|
|
$number = $value['number'];
|
|
|
$ftime = time() - 15 * 24 * 3600;
|
|
|
$z = $z . '(' . $odid . ')'; //查看订单号
|
|
|
@@ -3609,8 +3613,10 @@ class Whlabel extends Start_Controller
|
|
|
"bs" => $v["jm"],
|
|
|
"title" => $v["title"],
|
|
|
"features" => $v["pm"],
|
|
|
- "cpbz" => $v["cpbz"],
|
|
|
- "sm" => $v["sm"],
|
|
|
+ // "cpbz" => $v["cpbz"],
|
|
|
+ // "sm" => $v["sm"],
|
|
|
+ "cpbz" => empty($v["cpbz"])? $v["sm"] : $v["cpbz"]." ".$v['sm'],
|
|
|
+ "sm" => "",
|
|
|
"type" => $v["type"],
|
|
|
"number" => $v["number"],
|
|
|
"c" => $v["c"],
|
