|
@@ -62,6 +62,7 @@ class Typeclass extends Start_Controller {
|
|
|
$id = $this->input->post('id',true);
|
|
$id = $this->input->post('id',true);
|
|
|
$spare = $this->input->post('spare',true);
|
|
$spare = $this->input->post('spare',true);
|
|
|
$jm = $this->input->post('jm',true);
|
|
$jm = $this->input->post('jm',true);
|
|
|
|
|
+ $ysdj = $this->input->post('ysdj',true);
|
|
|
$content = $this->input->post('content',true);
|
|
$content = $this->input->post('content',true);
|
|
|
$hq = $this->input->post('hq',true);
|
|
$hq = $this->input->post('hq',true);
|
|
|
$order_str = "sequence asc,title asc";
|
|
$order_str = "sequence asc,title asc";
|
|
@@ -89,6 +90,9 @@ class Typeclass extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$where .= " and title like '%$title%'";
|
|
$where .= " and title like '%$title%'";
|
|
|
}
|
|
}
|
|
|
|
|
+ if(!empty($ysdj)){
|
|
|
|
|
+ $where .= " and ysdj = ".$ysdj." ";
|
|
|
|
|
+ }
|
|
|
if($id)
|
|
if($id)
|
|
|
{
|
|
{
|
|
|
$where .= " and id = '$id'";
|
|
$where .= " and id = '$id'";
|
|
@@ -123,7 +127,11 @@ class Typeclass extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
}
|
|
|
//取得信息列表
|
|
//取得信息列表
|
|
|
- $info_list = $this->typeclass->find_all($where,'id,classtitle,title,spare,bqsku,jm,zh,yzh,content,bm,hq,is_check,sequence,time',$order_str,$start,$perpage);
|
|
|
|
|
|
|
+ $info_list = $this->typeclass->find_all($where,'id,classtitle,title,spare,bqsku,jm,zh,yzh,ysdj,content,bm,hq,is_check,sequence,time',$order_str,$start,$perpage);
|
|
|
|
|
+
|
|
|
|
|
+ $dj_list = $this->typeclass->find_all("classid = 13");
|
|
|
|
|
+ $dj_list = array_column($dj_list,'title','id');
|
|
|
|
|
+
|
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
{
|
|
|
$u = $this->typeclass->read($value['id']);
|
|
$u = $this->typeclass->read($value['id']);
|
|
@@ -140,6 +148,12 @@ class Typeclass extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$info_list[$key]['hq'] = "";
|
|
$info_list[$key]['hq'] = "";
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if(isset($dj_list[$value['ysdj']])){
|
|
|
|
|
+ $info_list[$key]['ysdj'] = $dj_list[$value['ysdj']];
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $info_list[$key]['ysdj'] = "";
|
|
|
|
|
+ }
|
|
|
if($value['is_check'] == 0){
|
|
if($value['is_check'] == 0){
|
|
|
$info_list[$key]['is_check'] = "否";
|
|
$info_list[$key]['is_check'] = "否";
|
|
|
}else
|
|
}else
|
|
@@ -433,7 +447,10 @@ class Typeclass extends Start_Controller {
|
|
|
$where .= " and hq = '$hq'";
|
|
$where .= " and hq = '$hq'";
|
|
|
}
|
|
}
|
|
|
//取得信息列表
|
|
//取得信息列表
|
|
|
- $info_list = $this->typeclass->find_all($where,'classid,title,spare,bqsku,jm,zh,yzh,content,sequence,time',$order_str);
|
|
|
|
|
|
|
+ $info_list = $this->typeclass->find_all($where,'classid,title,spare,bqsku,jm,zh,yzh,ysdj,content,sequence,time',$order_str);
|
|
|
|
|
+
|
|
|
|
|
+ $ysdj_list = $this->typeclass->find_all("classid = 13");
|
|
|
|
|
+ $ysdj_list = array_column($ysdj_list,'title','id');
|
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
{
|
|
|
$c = $this->classid->read($value['classid']);
|
|
$c = $this->classid->read($value['classid']);
|
|
@@ -441,6 +458,11 @@ class Typeclass extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$info_list[$key]['classid'] = $c['title'];
|
|
$info_list[$key]['classid'] = $c['title'];
|
|
|
}
|
|
}
|
|
|
|
|
+ if(isset($ysdj_list[$value['ysdj']])){
|
|
|
|
|
+ $info_list[$key]['ysdj'] = $ysdj_list[$value['ysdj']];
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $info_list[$key]['ysdj'] = "";
|
|
|
|
|
+ }
|
|
|
$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
|
|
$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
|
|
|
}
|
|
}
|
|
|
$title = "SKU";
|
|
$title = "SKU";
|
|
@@ -453,6 +475,7 @@ class Typeclass extends Start_Controller {
|
|
|
<td>用友料号</td>
|
|
<td>用友料号</td>
|
|
|
<td>仓库品名</td>
|
|
<td>仓库品名</td>
|
|
|
<td>用友品名</td>
|
|
<td>用友品名</td>
|
|
|
|
|
+ <td>等级</td>
|
|
|
<td>备注</td>
|
|
<td>备注</td>
|
|
|
<td>排序</td>
|
|
<td>排序</td>
|
|
|
<td>添加时间</td>
|
|
<td>添加时间</td>
|