|
@@ -222,7 +222,7 @@ class Whlabel_bh extends Start_Controller {
|
|
$ck[$v['id']] = $v['title'];
|
|
$ck[$v['id']] = $v['title'];
|
|
}
|
|
}
|
|
//取得信息列表
|
|
//取得信息列表
|
|
- $info_list = $this->whlabel_bh->find_all($where,'id,orderinfo,title,shipremarks,bhnum,printnum,num,time,cscg',$order_str,$start,$perpage);
|
|
|
|
|
|
+ $info_list = $this->whlabel_bh->find_all($where,'id,orderinfo,title,shipremarks,bhnum,printnum,num,time,extra_type',$order_str,$start,$perpage);
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
{
|
|
{
|
|
$d = $this->whlabel_bh->read($value['id']);
|
|
$d = $this->whlabel_bh->read($value['id']);
|
|
@@ -232,7 +232,12 @@ class Whlabel_bh extends Start_Controller {
|
|
$info_list[$key]['printnum'] = $printnum;
|
|
$info_list[$key]['printnum'] = $printnum;
|
|
$info_list[$key]['num'] = $value['bhnum']-$printnum;
|
|
$info_list[$key]['num'] = $value['bhnum']-$printnum;
|
|
$info_list[$key]['time'] = date('Y-m-d',$value['time']).'<br>'.date('H:i:s',$value['time']);
|
|
$info_list[$key]['time'] = date('Y-m-d',$value['time']).'<br>'.date('H:i:s',$value['time']);
|
|
- $info_list[$key]['cscg'] = "<span data-id='".$value['id']."' data-num='".$value['bhnum']."' class='whlabel_bh_print'>打印布标</span>";
|
|
|
|
|
|
+ if($value['extra_type'] == 1){
|
|
|
|
+ $info_list[$key]['extra_type'] = "<span data-id='".$value['id']."' data-num='".$value['bhnum']."' class='whlabel_bh_print'>打印布标</span>";
|
|
|
|
+ }else{
|
|
|
|
+ $info_list[$key]['extra_type'] = "";
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
$total = $this->whlabel_bh->find_count($where);
|
|
$total = $this->whlabel_bh->find_count($where);
|
|
$pagenum = ceil($total/$perpage);
|
|
$pagenum = ceil($total/$perpage);
|
|
@@ -474,6 +479,7 @@ class Whlabel_bh extends Start_Controller {
|
|
$post['time'] = $time;//操作时间
|
|
$post['time'] = $time;//操作时间
|
|
$post['printnum'] = $time;
|
|
$post['printnum'] = $time;
|
|
$post['type'] = 0;
|
|
$post['type'] = 0;
|
|
|
|
+ $post['extra_type'] = (int)trim($post['extra_type'],',');
|
|
|
|
|
|
//传输料号开始
|
|
//传输料号开始
|
|
$lc = 0;
|
|
$lc = 0;
|